summaryrefslogtreecommitdiff
path: root/morphlib/builder2.py
diff options
context:
space:
mode:
authorLars Wirzenius <lars.wirzenius@codethink.co.uk>2012-06-26 11:01:22 +0100
committerLars Wirzenius <lars.wirzenius@codethink.co.uk>2012-06-26 11:01:22 +0100
commitc2587cf3aac2e9c734e040de86f07e950042c112 (patch)
treec58ff9ef03dbb15d78c8e43659f468b10cfc30ea /morphlib/builder2.py
parent7df187961636a4b7c990576f089b3d1d8de3b325 (diff)
downloadmorph-c2587cf3aac2e9c734e040de86f07e950042c112.tar.gz
Fix problems found by Richard in review
Diffstat (limited to 'morphlib/builder2.py')
-rw-r--r--morphlib/builder2.py6
1 files changed, 3 insertions, 3 deletions
diff --git a/morphlib/builder2.py b/morphlib/builder2.py
index 6dc55d15..aaff29d3 100644
--- a/morphlib/builder2.py
+++ b/morphlib/builder2.py
@@ -570,7 +570,7 @@ class SystemBuilder(BuilderBase): # pragma: no cover
self.local_artifact_cache)
if len(overlaps) > 0:
self.app.status(msg='Overlaps in system artifact '
- '%(artifact_name)detected',
+ '%(artifact_name)s detected',
artifact_name=self.artifact.name,
error=True)
log_overlaps(overlaps)
@@ -632,10 +632,10 @@ class SystemBuilder(BuilderBase): # pragma: no cover
cwd=path)
def _install_boot_files(self, arch, sourcefs, targetfs):
- self.app.status(msg='Installing boot files into root volume',
- chatty=True)
with self.build_watch('install-boot-files'):
if arch in ('x86', 'x86_64', None):
+ self.app.status(msg='Installing boot files into root volume',
+ chatty=True)
shutil.copy2(os.path.join(sourcefs, 'extlinux.conf'),
os.path.join(targetfs, 'extlinux.conf'))
os.mkdir(os.path.join(targetfs, 'boot'))