mirrors/fdroidserver
1
0
Fork 0
mirror of https://github.com/f-droid/fdroidserver.git synced 2025-09-16 16:02:33 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions

make FDroidPopen output based on --verbose

Browse source 
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:
Hans-Christoph Steiner 2014-06-02 16:12:50 -04:00
parent c6d946ed54
commit ed73db65ae
2 changed files with 6 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

4
fdroidserver/common.py
View file

@ -1531,7 +1531,7 @@ def SilentPopen(commands, cwd=None, shell=False):
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.
@ -1558,7 +1558,7 @@ def FDroidPopen(commands, cwd=None, shell=False, output=True):
while not stdout_reader.eof(): while not stdout_reader.eof():
while not stdout_queue.empty(): while not stdout_queue.empty():
line = stdout_queue.get() line = stdout_queue.get()
if output and options.verbose: if output or options.verbose:
# Output directly to console # Output directly to console
sys.stdout.write(line) sys.stdout.write(line)
sys.stdout.flush() sys.stdout.flush()

8
fdroidserver/update.py
View file

@ -363,8 +363,8 @@ def scan_apks(apps, apkcache, repodir, knownapks):
thisinfo = apkcache[apkfilename] thisinfo = apkcache[apkfilename]
else: else:
if options.verbose:
logging.info("Processing " + apkfilename) logging.info("Processing " + apkfilename)
thisinfo = {} thisinfo = {}
thisinfo['apkname'] = apkfilename thisinfo['apkname'] = apkfilename
srcfilename = apkfilename[:-4] + "_src.tar.gz" srcfilename = apkfilename[:-4] + "_src.tar.gz"
@ -801,8 +801,8 @@ def make_index(apps, apks, repodir, archive, categories):
if 'repo_keyalias' in config: if 'repo_keyalias' in config:
logging.info("Creating signed index with this key:") logging.info("Creating signed index with this key (SHA256):")
logging.info("SHA256: %s" % repo_pubkey_fingerprint) logging.info("%s" % repo_pubkey_fingerprint)
# Create a jar of the index... # Create a jar of the index...
p = FDroidPopen(['jar', 'cf', 'index.jar', 'index.xml'], cwd=repodir) p = FDroidPopen(['jar', 'cf', 'index.jar', 'index.xml'], cwd=repodir)