From: Scott Worley Date: Thu, 11 Jun 2020 20:38:20 +0000 (-0700) Subject: Don't hide stderr X-Git-Tag: 1.4~3 X-Git-Url: http://git.scottworley.com/pinch/commitdiff_plain/ba596fc0a680ccf113b880d72ab873b56c13f530?ds=inline Don't hide stderr Only capture stdout; allow stderr to leak out to the terminal. This allows diagnosis of errors from subprocesses. --- diff --git a/pinch.py b/pinch.py index 5d93c26..b761313 100644 --- a/pinch.py +++ b/pinch.py @@ -184,7 +184,7 @@ def digest_file(filename: str) -> Digest16: def to_Digest16(v: Verification, digest32: Digest32) -> Digest16: v.status('Converting digest to base16') process = subprocess.run( - ['nix', 'to-base16', '--type', 'sha256', digest32], capture_output=True) + ['nix', 'to-base16', '--type', 'sha256', digest32], stdout=subprocess.PIPE) v.result(process.returncode == 0) return Digest16(process.stdout.decode().strip()) @@ -192,7 +192,7 @@ def to_Digest16(v: Verification, digest32: Digest32) -> Digest16: def to_Digest32(v: Verification, digest16: Digest16) -> Digest32: v.status('Converting digest to base32') process = subprocess.run( - ['nix', 'to-base32', '--type', 'sha256', digest16], capture_output=True) + ['nix', 'to-base32', '--type', 'sha256', digest16], stdout=subprocess.PIPE) v.result(process.returncode == 0) return Digest32(process.stdout.decode().strip()) @@ -203,7 +203,7 @@ def fetch_with_nix_prefetch_url( digest: Digest16) -> str: v.status('Fetching %s' % url) process = subprocess.run( - ['nix-prefetch-url', '--print-path', url, digest], capture_output=True) + ['nix-prefetch-url', '--print-path', url, digest], stdout=subprocess.PIPE) v.result(process.returncode == 0) prefetch_digest, path, empty = process.stdout.decode().split('\n') assert empty == '' @@ -417,7 +417,7 @@ def git_get_tarball(v: Verification, channel: Channel) -> str: v.status('Putting tarball in Nix store') process = subprocess.run( - ['nix-store', '--add', output_filename], capture_output=True) + ['nix-store', '--add', output_filename], stdout=subprocess.PIPE) v.result(process.returncode == 0) store_tarball = process.stdout.decode().strip() @@ -483,7 +483,7 @@ def git_revision_name(v: Verification, channel: Channel) -> str: '--format=%ct-%h', '--abbrev=11', channel.git_revision], - capture_output=True) + stdout=subprocess.PIPE) v.result(process.returncode == 0 and process.stdout != b'') return '%s-%s' % (os.path.basename(channel.git_repo), process.stdout.decode().strip())