From 2d2d21fc38f45843ebc52a24827716a41cc189b3 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Daniel=20Mart=C3=AD?= Date: Mon, 27 Jan 2014 16:45:39 +0100 Subject: [PATCH] Don't always print output in FDroidPopen when -v is given --- fdroidserver/common.py | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/fdroidserver/common.py b/fdroidserver/common.py index afc0fa3f..f8e512cb 100644 --- a/fdroidserver/common.py +++ b/fdroidserver/common.py @@ -1323,7 +1323,8 @@ def isApkDebuggable(apkfile, config): p = FDroidPopen([os.path.join(config['sdk_path'], 'build-tools', config['build_tools'], 'aapt'), - 'dump', 'xmltree', apkfile, 'AndroidManifest.xml']) + 'dump', 'xmltree', apkfile, 'AndroidManifest.xml'], + output=False) if p.returncode != 0: logging.critical("Failed to get apk manifest information") sys.exit(1) @@ -1360,12 +1361,13 @@ class PopenResult: returncode = None stdout = '' -def FDroidPopen(commands, cwd=None): +def FDroidPopen(commands, cwd=None, output=True): """ Run a command and capture the output. :param commands: command and argument list like in subprocess.Popen :param cwd: optionally specifies a working directory + :param output: whether to print output as it is fetched :returns: A PopenResult. """ @@ -1386,7 +1388,7 @@ def FDroidPopen(commands, cwd=None): while not stdout_reader.eof(): while not stdout_queue.empty(): line = stdout_queue.get() - if options.verbose: + if output and options.verbose: # Output directly to console sys.stdout.write(line) sys.stdout.flush() -- 2.30.2