X-Git-Url: http://git.scottworley.com/pinch/blobdiff_plain/3603dde2e015c340cac1a2f1a0f3d35d44c51c98..b5964ec35e259f36550d6e8c7fa60412db05a049:/pinch.py

diff --git a/pinch.py b/pinch.py
index 003ee70..5f25015 100644
--- a/pinch.py
+++ b/pinch.py
@@ -83,7 +83,7 @@ class Verification:
     def result(self, r: bool) -> None:
         message, color = {True: ('OK ', 92), False: ('FAIL', 91)}[r]
         length = len(message)
-        cols = shutil.get_terminal_size().columns
+        cols = shutil.get_terminal_size().columns or 80
         pad = (cols - (self.line_length + length)) % cols
         print(' ' * pad + self._color(message, color), file=sys.stderr)
         self.line_length = 0
@@ -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()
 
@@ -478,12 +478,12 @@ def git_revision_name(v: Verification, channel: Channel) -> str:
     process = subprocess.run(['git',
                               '-C',
                               git_cachedir(channel.git_repo),
-                              'lo',
+                              'log',
                               '-n1',
                               '--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())
@@ -602,4 +602,5 @@ def main() -> None:
     args.func(args)
 
 
-main()
+if __name__ == '__main__':
+    main()