summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPaul Sherwood <paul.sherwood@codethink.co.uk>2014-06-22 21:52:55 +0000
committerPaul Sherwood <paul.sherwood@codethink.co.uk>2014-06-22 22:27:28 +0000
commit1c4eb957de02c64dcb2f8b7de7135339e18c44a6 (patch)
tree6d8281de47f72060b6f8906d08a262a2ec0b636a
parentc894d6e153d7803e8f4639c2697c0c592a460980 (diff)
downloadmorph-baserock/ps/show-8-chars.tar.gz
Show-which-commit-morph-intends-to-build-v2baserock/ps/show-8-chars
When debugging, it's useful to know exactly which version of a chunk morph is using. And let's show 8 chars instead of 7
-rw-r--r--morphlib/buildcommand.py11
1 files changed, 6 insertions, 5 deletions
diff --git a/morphlib/buildcommand.py b/morphlib/buildcommand.py
index f68046e3..f160345d 100644
--- a/morphlib/buildcommand.py
+++ b/morphlib/buildcommand.py
@@ -209,7 +209,7 @@ class BuildCommand(object):
# and Ref specified.
if src.morphology['kind'] == 'stratum':
name = src.morphology['name']
- ref = src.sha1[:7]
+ ref = src.sha1[:8]
self.app.status(msg='Stratum [%(name)s] version is %(ref)s',
name=name, ref=ref)
if name in stratum_names:
@@ -307,9 +307,10 @@ class BuildCommand(object):
in either the local or remote cache already.
'''
- self.app.status(msg='Building %(kind)s %(name)s',
+ self.app.status(msg='Building %(kind)s %(name)s %(sha1)s',
name=artifact.name,
- kind=artifact.source.morphology['kind'])
+ kind=artifact.source.morphology['kind'],
+ sha1=artifact.source.sha1[:8])
self.get_sources(artifact)
deps = self.get_recursive_deps(artifact)
@@ -481,7 +482,7 @@ class BuildCommand(object):
self.app.status(
msg='Installing chunk %(chunk_name)s from cache %(cache)s',
chunk_name=artifact.name,
- cache=artifact.cache_key[:7],
+ cache=artifact.cache_key[:8],
chatty=True)
handle = self.lac.get(artifact)
staging_area.install_artifact(handle)
@@ -494,7 +495,7 @@ class BuildCommand(object):
self.app.status(msg='Starting actual build: %(name)s '
'%(sha1)s',
- name=artifact.name, sha1=artifact.source.sha1[:7])
+ name=artifact.name, sha1=artifact.source.sha1[:8])
builder = morphlib.builder2.Builder(
self.app, staging_area, self.lac, self.rac, self.lrc,
self.app.settings['max-jobs'], setup_mounts)