diff options
| author | Sam Thursfield <sam.thursfield@codethink.co.uk> | 2013-03-18 09:41:52 +0000 |
|---|---|---|
| committer | Sam Thursfield <sam.thursfield@codethink.co.uk> | 2013-03-18 09:42:47 +0000 |
| commit | ce35f0033cc7e29797c6255991f54795b6d31d74 (patch) | |
| tree | ce324754fc2e235859f5a09998a446d825ef3c21 | |
| parent | bc75c73829adc2446bd4ccdcbb6fe85ea4b62ba4 (diff) | |
| download | morph-ce35f0033cc7e29797c6255991f54795b6d31d74.tar.gz | |
Fix long lines
| -rw-r--r-- | morphlib/buildcommand.py | 9 | ||||
| -rwxr-xr-x | tests.as-root/branch-from-image-works.script | 3 |
2 files changed, 8 insertions, 4 deletions
diff --git a/morphlib/buildcommand.py b/morphlib/buildcommand.py index 0e91f8a1..d49f9e72 100644 --- a/morphlib/buildcommand.py +++ b/morphlib/buildcommand.py @@ -195,8 +195,10 @@ class BuildCommand(object): self.app.status_prefix = ( old_prefix + '[Build %d/%d] ' % ((i+1), len(artifacts))) - self.app.status(msg='[%(name)s] Checking if %(kind)s needs building %(sha1)s', - name=a.name, kind=a.source.morphology['kind'], sha1=a.source.sha1[:7]) + self.app.status(msg='[%(name)s] Checking if %(kind)s needs ' + 'building %(sha1)s', + name=a.name, kind=a.source.morphology['kind'], + sha1=a.source.sha1[:7]) if self.is_built(a): self.app.status(msg='[%(name)s] The %(kind)s is already built', @@ -388,7 +390,8 @@ class BuildCommand(object): def build_and_cache(self, staging_area, artifact, setup_mounts): '''Build an artifact and put it into the local artifact cache.''' - self.app.status(msg='[%(name)s] Starting actual build: %(name)s %(sha1)s', + self.app.status(msg='[%(name)s] Starting actual build: %(name)s ' + '%(sha1)s', name=artifact.name, sha1=artifact.source.sha1[:7]) setup_mounts = self.app.settings['staging-chroot'] builder = morphlib.builder2.Builder( diff --git a/tests.as-root/branch-from-image-works.script b/tests.as-root/branch-from-image-works.script index 9afab661..9f82f629 100755 --- a/tests.as-root/branch-from-image-works.script +++ b/tests.as-root/branch-from-image-works.script @@ -49,7 +49,8 @@ workspace="$DATADIR/workspace" "$SRCDIR/scripts/test-morph" init "$workspace" cd "$workspace" "$SRCDIR/scripts/test-morph" branch-from-image \ - test:morphs mybranch --metadata-dir="$extracted/baserock" + test:morphs mybranch \ + --metadata-dir="$extracted/baserock" cd mybranch/test:morphs grep -qFe "$hello_chunk_commit" hello-stratum.morph tar=$("$SRCDIR/scripts/test-morph" --find-system-artifact build hello-tarball) |