From 426526c692fecd520b1946f362e148d043c61441 Mon Sep 17 00:00:00 2001 From: Sam Thursfield Date: Wed, 29 Oct 2014 17:12:15 +0000 Subject: Echo stderr of subcommands that do network IO when --verbose is used Morph can appear to hang in situations where it is actually waiting on a slow network operation. This change gives users a way to see the output of the subcommands that are doing the network IO (either 'wget', 'git clone' or 'git remote update'). The status information goes onto stderr, because that is where the subcommands write it. Morph tends to put its status output on stdout, but (a) some commands are machine-parsed, such as `serialise-artifact` and (b) it's tricky to get Git to put status output on stdout. --- morphlib/cachedrepo.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'morphlib/cachedrepo.py') diff --git a/morphlib/cachedrepo.py b/morphlib/cachedrepo.py index 30e08ad9..aad3d84e 100644 --- a/morphlib/cachedrepo.py +++ b/morphlib/cachedrepo.py @@ -298,7 +298,8 @@ class CachedRepo(object): def _update(self): # pragma: no cover morphlib.git.gitcmd(self._runcmd, 'remote', 'update', - 'origin', '--prune') + 'origin', '--prune', + echo_stderr=self.app.settings['verbose']) def __str__(self): # pragma: no cover return self.url -- cgit v1.2.1