From e39602586f3ddc8032c607a988bd2116ed6e02fe Mon Sep 17 00:00:00 2001 From: =?utf8?q?Daniel=20Mart=C3=AD?= Date: Wed, 31 Dec 2014 16:34:11 +0100 Subject: [PATCH] Make dump xmltree and dump badging silent again --- fdroidserver/build.py | 2 +- fdroidserver/common.py | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/fdroidserver/build.py b/fdroidserver/build.py index 498cd413..01eb2f96 100644 --- a/fdroidserver/build.py +++ b/fdroidserver/build.py @@ -754,7 +754,7 @@ def build_local(app, thisbuild, vcs, build_dir, output_dir, srclib_dir, extlib_d if not os.path.exists(src): raise BuildException("Unsigned apk is not at expected location of " + src) - p = SdkToolsPopen(['aapt', 'dump', 'badging', src]) + p = SdkToolsPopen(['aapt', 'dump', 'badging', src], output=False) vercode = None version = None diff --git a/fdroidserver/common.py b/fdroidserver/common.py index 72208f5b..adb3cd61 100644 --- a/fdroidserver/common.py +++ b/fdroidserver/common.py @@ -1598,7 +1598,8 @@ def isApkDebuggable(apkfile, config): :param apkfile: full path to the apk to check""" - p = SdkToolsPopen(['aapt', 'dump', 'xmltree', apkfile, 'AndroidManifest.xml']) + p = SdkToolsPopen(['aapt', 'dump', 'xmltree', apkfile, 'AndroidManifest.xml'], + output=False) if p.returncode != 0: logging.critical("Failed to get apk manifest information") sys.exit(1) -- 2.30.2