summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLars Wirzenius <lars.wirzenius@codethink.co.uk>2012-06-25 16:34:58 +0100
committerLars Wirzenius <lars.wirzenius@codethink.co.uk>2012-06-25 17:23:09 +0100
commita2306747ee938a6859c462a57d180d926d761934 (patch)
tree8d7d49bda388c8bd61985e90505d31ef7c5fdc02
parent6ae12c361290c60c36a96470940b94b5137c5b35 (diff)
downloadmorph-a2306747ee938a6859c462a57d180d926d761934.tar.gz
Add status message for unpacking chunks
-rwxr-xr-xmorphlib/app.py5
-rw-r--r--morphlib/builder2.py4
2 files changed, 5 insertions, 4 deletions
diff --git a/morphlib/app.py b/morphlib/app.py
index 3f0d8ac9..6cc165d5 100755
--- a/morphlib/app.py
+++ b/morphlib/app.py
@@ -269,9 +269,8 @@ class Morph(cliapp.Application):
remote.close()
local.close()
- self.status(msg='Installing %(kind)s %(artifact_name)s',
- artifact_name=chunk_artifact.name,
- kind=chunk_artifact.source.morphology['kind'])
+ self.status(msg='Installing chunk %(chunk_name)s',
+ chunk_name=chunk_artifact.name)
handle = lac.get(chunk_artifact)
staging_area.install_artifact(handle)
diff --git a/morphlib/builder2.py b/morphlib/builder2.py
index 4e6f7dde..67ad2822 100644
--- a/morphlib/builder2.py
+++ b/morphlib/builder2.py
@@ -289,7 +289,7 @@ class ChunkBuilder(BuilderBase):
def extract_repo(path, sha1, destdir):
self.app.status(msg='Extracting %(source)s into %(target)s',
source=path,
- target=destdir))
+ target=destdir)
if not os.path.exists(destdir):
os.mkdir(destdir)
morphlib.git.copy_repository(self.app.runcmd, path, destdir)
@@ -577,6 +577,8 @@ class SystemBuilder(BuilderBase): # pragma: no cover
for stratum_artifact in self.artifact.dependencies:
f = self.local_artifact_cache.get(stratum_artifact)
for chunk in (ArtifactCacheReference(a) for a in json.load(f)):
+ self.app.status(msg='Unpacking chunk %(chunk_name)s',
+ chunk_name=chunk.name, chatty=True)
chunk_handle = self.local_artifact_cache.get(chunk)
morphlib.bins.unpack_binary_from_file(chunk_handle, path)
chunk_handle.close()