summaryrefslogtreecommitdiffstats
path: root/repo
diff options
context:
space:
mode:
Diffstat (limited to 'repo')
-rwxr-xr-xrepo8
1 files changed, 5 insertions, 3 deletions
diff --git a/repo b/repo
index ea3df1d5..40dadac6 100755
--- a/repo
+++ b/repo
@@ -339,10 +339,12 @@ def run_command(cmd, **kwargs):
339 (cmd[0], ret.returncode), file=sys.stderr) 339 (cmd[0], ret.returncode), file=sys.stderr)
340 print(' cwd: %s\n cmd: %r' % 340 print(' cwd: %s\n cmd: %r' %
341 (kwargs.get('cwd', os.getcwd()), cmd), file=sys.stderr) 341 (kwargs.get('cwd', os.getcwd()), cmd), file=sys.stderr)
342
342 def _print_output(name, output): 343 def _print_output(name, output):
343 if output: 344 if output:
344 print(' %s:\n >> %s' % (name, '\n >> '.join(output.splitlines())), 345 print(' %s:\n >> %s' % (name, '\n >> '.join(output.splitlines())),
345 file=sys.stderr) 346 file=sys.stderr)
347
346 _print_output('stdout', ret.stdout) 348 _print_output('stdout', ret.stdout)
347 _print_output('stderr', ret.stderr) 349 _print_output('stderr', ret.stderr)
348 raise RunError(ret) 350 raise RunError(ret)
@@ -614,9 +616,9 @@ def SetupGnuPG(quiet):
614 616
615 cmd = ['gpg', '--import'] 617 cmd = ['gpg', '--import']
616 try: 618 try:
617 ret = run_command(cmd, env=env, stdin=subprocess.PIPE, 619 run_command(cmd, env=env, stdin=subprocess.PIPE,
618 capture_output=quiet, 620 capture_output=quiet,
619 input=MAINTAINER_KEYS.encode('utf-8')) 621 input=MAINTAINER_KEYS.encode('utf-8'))
620 except OSError: 622 except OSError:
621 if not quiet: 623 if not quiet:
622 print('warning: gpg (GnuPG) is not available.', file=sys.stderr) 624 print('warning: gpg (GnuPG) is not available.', file=sys.stderr)