mirror of
https://gitlab.com/fdroid/fdroidserver.git
synced 2024-09-11 23:23:27 +02:00
make FDroidPopen output based on --verbose
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.
This commit is contained in:
parent
c6d946ed54
commit
ed73db65ae
@ -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()
|
||||
|
@ -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)
|
||||
|
Loading…
Reference in New Issue
Block a user