Test

[pinch] / pinch.py

diff --git a/pinch.py b/pinch.py
index 6bd7dd3d256f8021755ebb269851ee084f0c3599..46e5af30f9111043827bab3089040c1acaf1699f 100644 (file)
--- a/pinch.py
+++ b/pinch.py
@@ -7,8 +7,10 @@ import hashlib
 import operator
 import os
 import os.path
 import operator
 import os
 import os.path

+import shlex

 import shutil
 import subprocess
 import shutil
 import subprocess

+import sys

 import tempfile
 import types
 import urllib.parse
 import tempfile
 import types
 import urllib.parse


@@ -57,7 +59,7 @@ class Verification:
         self.line_length = 0
 
     def status(self, s: str) -> None:
         self.line_length = 0
 
     def status(self, s: str) -> None:

-        print(s, end=' ', flush=True)
+        print(s, end=' ', file=sys.stderr, flush=True)

         self.line_length += 1 + len(s)  # Unicode??
 
     @staticmethod
         self.line_length += 1 + len(s)  # Unicode??
 
     @staticmethod


@@ -69,7 +71,7 @@ class Verification:
         length = len(message)
         cols = shutil.get_terminal_size().columns
         pad = (cols - (self.line_length + length)) % cols
         length = len(message)
         cols = shutil.get_terminal_size().columns
         pad = (cols - (self.line_length + length)) % cols

-        print(' ' * pad + self._color(message, color))
+        print(' ' * pad + self._color(message, color), file=sys.stderr)

         self.line_length = 0
         if not r:
             raise VerificationError()
         self.line_length = 0
         if not r:
             raise VerificationError()


@@ -458,6 +460,8 @@ def pin(args: argparse.Namespace) -> None:
     config = configparser.ConfigParser()
     config.read_file(open(args.channels_file), args.channels_file)
     for section in config.sections():
     config = configparser.ConfigParser()
     config.read_file(open(args.channels_file), args.channels_file)
     for section in config.sections():

+        if args.channels and section not in args.channels:
+            continue

 
         channel = Channel(**dict(config[section].items()))
         if hasattr(channel, 'git_revision'):
 
         channel = Channel(**dict(config[section].items()))
         if hasattr(channel, 'git_revision'):


@@ -495,20 +499,22 @@ def update(args: argparse.Namespace) -> None:
         exprs.append(
             'f: f { name = "%s"; channelName = "%s"; src = builtins.storePath "%s"; }' %
             (config[section]['release_name'], section, tarball))
         exprs.append(
             'f: f { name = "%s"; channelName = "%s"; src = builtins.storePath "%s"; }' %
             (config[section]['release_name'], section, tarball))

-    v.status('Installing channels with nix-env')
-    process = subprocess.run(
-        [
-            'nix-env',
-            '--profile',
-            '/nix/var/nix/profiles/per-user/%s/channels' %
-            getpass.getuser(),
-            '--show-trace',
-            '--file',
-            '<nix/unpack-channel.nix>',
-            '--install',
-            '--from-expression'] +
-        exprs)
-    v.result(process.returncode == 0)
+    command = [
+        'nix-env',
+        '--profile',
+        '/nix/var/nix/profiles/per-user/%s/channels' %
+        getpass.getuser(),
+        '--show-trace',
+        '--file',
+        '<nix/unpack-channel.nix>',
+        '--install',
+        '--from-expression'] + exprs
+    if args.dry_run:
+        print(' '.join(map(shlex.quote, command)))
+    else:
+        v.status('Installing channels with nix-env')
+        process = subprocess.run(command)
+        v.result(process.returncode == 0)

 
 
 def main() -> None:
 
 
 def main() -> None:


@@ -516,8 +522,10 @@ def main() -> None:
     subparsers = parser.add_subparsers(dest='mode', required=True)
     parser_pin = subparsers.add_parser('pin')
     parser_pin.add_argument('channels_file', type=str)
     subparsers = parser.add_subparsers(dest='mode', required=True)
     parser_pin = subparsers.add_parser('pin')
     parser_pin.add_argument('channels_file', type=str)

+    parser_pin.add_argument('channels', type=str, nargs='*')

     parser_pin.set_defaults(func=pin)
     parser_update = subparsers.add_parser('update')
     parser_pin.set_defaults(func=pin)
     parser_update = subparsers.add_parser('update')

+    parser_update.add_argument('--dry-run', action='store_true')

     parser_update.add_argument('channels_file', type=str)
     parser_update.set_defaults(func=update)
     args = parser.parse_args()
     parser_update.add_argument('channels_file', type=str)
     parser_update.set_defaults(func=update)
     args = parser.parse_args()