diff --git a/fdroidserver/common.py b/fdroidserver/common.py index a5e9bd09..81675657 100644 --- a/fdroidserver/common.py +++ b/fdroidserver/common.py @@ -1531,7 +1531,7 @@ def SilentPopen(commands, cwd=None, shell=False): return FDroidPopen(commands, cwd=cwd, shell=shell, output=False) -def FDroidPopen(commands, cwd=None, shell=False, output=True): +def FDroidPopen(commands, cwd=None, shell=False, output=False): """ Run a command and capture the possibly huge output. @@ -1558,7 +1558,7 @@ def FDroidPopen(commands, cwd=None, shell=False, output=True): while not stdout_reader.eof(): while not stdout_queue.empty(): line = stdout_queue.get() - if output and options.verbose: + if output or options.verbose: # Output directly to console sys.stdout.write(line) sys.stdout.flush() diff --git a/fdroidserver/update.py b/fdroidserver/update.py index 0f7d7a9d..d7e93fcf 100644 --- a/fdroidserver/update.py +++ b/fdroidserver/update.py @@ -363,8 +363,8 @@ def scan_apks(apps, apkcache, repodir, knownapks): thisinfo = apkcache[apkfilename] else: - - logging.info("Processing " + apkfilename) + if options.verbose: + logging.info("Processing " + apkfilename) thisinfo = {} thisinfo['apkname'] = apkfilename srcfilename = apkfilename[:-4] + "_src.tar.gz" @@ -801,8 +801,8 @@ def make_index(apps, apks, repodir, archive, categories): if 'repo_keyalias' in config: - logging.info("Creating signed index with this key:") - logging.info("SHA256: %s" % repo_pubkey_fingerprint) + logging.info("Creating signed index with this key (SHA256):") + logging.info("%s" % repo_pubkey_fingerprint) # Create a jar of the index... p = FDroidPopen(['jar', 'cf', 'index.jar', 'index.xml'], cwd=repodir)