diff options
| author | Lars Wirzenius <lars.wirzenius@codethink.co.uk> | 2014-03-13 11:26:37 +0000 |
|---|---|---|
| committer | Lars Wirzenius <lars.wirzenius@codethink.co.uk> | 2014-03-13 11:26:37 +0000 |
| commit | a0fefde8c4900269bb227f1986324b77a7511664 (patch) | |
| tree | 523f34f0a0b07f5391fed1a6b227a1d9143a333c | |
| parent | ca74e62cd114045270a0bc5fc63acb0f5ae4a968 (diff) | |
| parent | c1d73faab8d3a9ad50e76c57d41ccbf266a88048 (diff) | |
| download | morph-a0fefde8c4900269bb227f1986324b77a7511664.tar.gz | |
Merge branch 'liw/quieten-staging-area'
Reviewed-by: Sam Thursfield
Reviewed-by: Adam Coldrick
| -rw-r--r-- | morphlib/buildcommand.py | 9 | ||||
| -rw-r--r-- | morphlib/stagingarea.py | 5 | ||||
| -rw-r--r-- | morphlib/stagingarea_tests.py | 2 |
3 files changed, 10 insertions, 6 deletions
diff --git a/morphlib/buildcommand.py b/morphlib/buildcommand.py index 137c63b4..862ae715 100644 --- a/morphlib/buildcommand.py +++ b/morphlib/buildcommand.py @@ -454,10 +454,11 @@ class BuildCommand(object): if artifact.source.build_mode == 'bootstrap': if not self.in_same_stratum(artifact, target_artifact): continue - self.app.status(msg='Installing chunk %(chunk_name)s ' - 'from cache %(cache)s', - chunk_name=artifact.name, - cache=artifact.cache_key[:7]) + self.app.status( + msg='Installing chunk %(chunk_name)s from cache %(cache)s', + chunk_name=artifact.name, + cache=artifact.cache_key[:7], + chatty=True) handle = self.lac.get(artifact) staging_area.install_artifact(handle) diff --git a/morphlib/stagingarea.py b/morphlib/stagingarea.py index 286e5374..dca19c23 100644 --- a/morphlib/stagingarea.py +++ b/morphlib/stagingarea.py @@ -1,4 +1,4 @@ -# Copyright (C) 2012-2013 Codethink Limited +# Copyright (C) 2012-2014 Codethink Limited # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by @@ -160,6 +160,9 @@ class StagingArea(object): unpacked_artifact = os.path.join( chunk_cache_dir, os.path.basename(handle.name) + '.d') if not os.path.exists(unpacked_artifact): + self._app.status( + msg='Unpacking chunk from cache %(filename)s', + filename=os.path.basename(handle.name)) savedir = tempfile.mkdtemp(dir=chunk_cache_dir) try: morphlib.bins.unpack_binary_from_file( diff --git a/morphlib/stagingarea_tests.py b/morphlib/stagingarea_tests.py index 27f85dff..1c424ab8 100644 --- a/morphlib/stagingarea_tests.py +++ b/morphlib/stagingarea_tests.py @@ -57,7 +57,7 @@ class FakeApplication(object): def runcmd_unchecked(self, *args, **kwargs): return cliapp.runcmd_unchecked(*args, **kwargs) - def status(self, msg): + def status(self, **kwargs): pass |