From 07a0b8322d2925e2c813a7f5541b0593c46f6693 Mon Sep 17 00:00:00 2001 From: Sam Thursfield Date: Tue, 28 Apr 2015 11:56:27 +0000 Subject: Show progress of downloads when --verbose is passed, not --debug This commit undoes behaviour changes from commit aa6dfcbb70c03dfeb3f9af02. Change-Id: Ie677fb9c4e6bcd6edeba2cdd87f4f6125dcae7a4 --- morphlib/cachedrepo.py | 2 +- morphlib/cachedrepo_tests.py | 2 +- morphlib/localrepocache.py | 2 +- morphlib/localrepocache_tests.py | 3 ++- 4 files changed, 5 insertions(+), 4 deletions(-) diff --git a/morphlib/cachedrepo.py b/morphlib/cachedrepo.py index 9f6ee46b..76cdaa86 100644 --- a/morphlib/cachedrepo.py +++ b/morphlib/cachedrepo.py @@ -258,7 +258,7 @@ class CachedRepo(object): try: self.gitdir.update_remotes( - echo_stderr=self.app.settings['debug']) + echo_stderr=self.app.settings['verbose']) self.already_updated = True except cliapp.AppException: raise UpdateError(self) diff --git a/morphlib/cachedrepo_tests.py b/morphlib/cachedrepo_tests.py index d32ce2eb..d26c0236 100644 --- a/morphlib/cachedrepo_tests.py +++ b/morphlib/cachedrepo_tests.py @@ -28,7 +28,7 @@ class FakeApplication(object): def __init__(self): self.settings = { - 'debug': True + 'verbose': True } diff --git a/morphlib/localrepocache.py b/morphlib/localrepocache.py index 53f3d5a4..3c00756c 100644 --- a/morphlib/localrepocache.py +++ b/morphlib/localrepocache.py @@ -118,7 +118,7 @@ class LocalRepoCache(object): self._app.status(msg="Trying to fetch %(tarball)s to seed the cache", tarball=url, chatty=True) - if self._app.settings['debug']: + if self._app.settings['verbose']: verbosity_flags = [] kwargs = dict(stderr=sys.stderr) else: diff --git a/morphlib/localrepocache_tests.py b/morphlib/localrepocache_tests.py index 5ac85e95..898894db 100644 --- a/morphlib/localrepocache_tests.py +++ b/morphlib/localrepocache_tests.py @@ -28,7 +28,8 @@ class FakeApplication(object): def __init__(self): self.settings = { - 'debug': True + 'debug': True, + 'verbose': True } def status(self, msg): -- cgit v1.2.1