FDroidPopen outputs by default, this should be controlled by the --verbose
flag so that most of the time, only meaningful messages are shown like
errors and such. For command output that should be shown everytime,
output=True can be set.
return FDroidPopen(commands, cwd=cwd, shell=shell, output=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.
"""
Run a command and capture the possibly huge output.
while not stdout_reader.eof():
while not stdout_queue.empty():
line = stdout_queue.get()
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()
# Output directly to console
sys.stdout.write(line)
sys.stdout.flush()
thisinfo = apkcache[apkfilename]
else:
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"
thisinfo = {}
thisinfo['apkname'] = apkfilename
srcfilename = apkfilename[:-4] + "_src.tar.gz"
if 'repo_keyalias' in config:
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)
# Create a jar of the index...
p = FDroidPopen(['jar', 'cf', 'index.jar', 'index.xml'], cwd=repodir)