X-Git-Url: http://git.scottworley.com/pinch/blobdiff_plain/4fdb3625fc47889c73bb4af21da1a67dcb185a65..9a78329ed18525c690e7d8b556bb891934f77517:/pinch.py diff --git a/pinch.py b/pinch.py index 6bd7dd3..4a6158a 100644 --- a/pinch.py +++ b/pinch.py @@ -7,6 +7,7 @@ import hashlib import operator import os import os.path +import shlex import shutil import subprocess import tempfile @@ -458,6 +459,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(): + if args.channels and section not in args.channels: + continue channel = Channel(**dict(config[section].items())) if hasattr(channel, 'git_revision'): @@ -495,20 +498,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)) - 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', - '', - '--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', + '', + '--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: @@ -516,8 +521,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) + parser_pin.add_argument('channels', type=str, nargs='*') 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()