From 7fc55a3847e611ee586c5425ad91b82dcd872c39 Mon Sep 17 00:00:00 2001 From: Dmitriy Bogdanov Date: Wed, 17 Feb 2016 22:22:57 +0400 Subject: [PATCH] Fix pubkey extraction on update Fix pubkey extraction in case of non-empty _JAVA_OPTIONS --- fdroidserver/common.py | 17 +++++++++++++++-- fdroidserver/update.py | 3 ++- 2 files changed, 17 insertions(+), 3 deletions(-) diff --git a/fdroidserver/common.py b/fdroidserver/common.py index 5a6c64ab..5ea9e549 100644 --- a/fdroidserver/common.py +++ b/fdroidserver/common.py @@ -1623,7 +1623,7 @@ def SdkToolsPopen(commands, cwd=None, output=True): cwd=cwd, output=output) -def FDroidPopen(commands, cwd=None, output=True): +def FDroidPopen(commands, cwd=None, output=True, stderr_to_stdout=True): """ Run a command and capture the possibly huge output. @@ -1639,15 +1639,28 @@ def FDroidPopen(commands, cwd=None, output=True): logging.debug("Directory: %s" % cwd) logging.debug("> %s" % ' '.join(commands)) + stderr_param = subprocess.STDOUT if stderr_to_stdout else subprocess.PIPE result = PopenResult() p = None try: p = subprocess.Popen(commands, cwd=cwd, shell=False, env=env, - stdout=subprocess.PIPE, stderr=subprocess.STDOUT) + stdout=subprocess.PIPE, stderr=stderr_param) except OSError as e: raise BuildException("OSError while trying to execute " + ' '.join(commands) + ': ' + str(e)) + if not stderr_to_stdout and options.verbose: + stderr_queue = Queue() + stderr_reader = AsynchronousFileReader(p.stderr, stderr_queue) + + while not stderr_reader.eof(): + while not stderr_queue.empty(): + line = stderr_queue.get() + sys.stderr.write(line) + sys.stderr.flush() + + time.sleep(0.1) + stdout_queue = Queue() stdout_reader = AsynchronousFileReader(p.stdout, stdout_queue) diff --git a/fdroidserver/update.py b/fdroidserver/update.py index aa9a9a3b..9de64717 100644 --- a/fdroidserver/update.py +++ b/fdroidserver/update.py @@ -716,7 +716,8 @@ def extract_pubkey(): '-alias', config['repo_keyalias'], '-keystore', config['keystore'], '-storepass:file', config['keystorepassfile']] - + config['smartcardoptions'], output=False) + + config['smartcardoptions'], + output=False, stderr_to_stdout=False) if p.returncode != 0 or len(p.output) < 20: msg = "Failed to get repo pubkey!" if config['keystore'] == 'NONE': -- 2.30.2