X-Git-Url: http://git.scottworley.com/pinch/blobdiff_plain/4aaa88e0a2069e14830f07f1ad3190d6d13b43a0..55ae4ff693dee4323804eae4232141fb2e524c7e:/pinch.py?ds=sidebyside diff --git a/pinch.py b/pinch.py index d8bf75c..4c2341f 100644 --- a/pinch.py +++ b/pinch.py @@ -148,7 +148,7 @@ class GitSearchPath(TarrableSearchPath): def fetch(self, v: Verification, section: str, conf: configparser.SectionProxy) -> str: - if 'git_repo' not in conf or 'release_name' not in conf: + if 'git_revision' not in conf or 'release_name' not in conf: raise Exception( 'Cannot update unpinned channel "%s" (Run "pin" before "update")' % section) @@ -609,7 +609,7 @@ def read_config_files( return merged_config -def pin(args: argparse.Namespace) -> None: +def pinCommand(args: argparse.Namespace) -> None: v = Verification() config = read_config(args.channels_file) for section in config.sections(): @@ -624,7 +624,7 @@ def pin(args: argparse.Namespace) -> None: config.write(configfile) -def update(args: argparse.Namespace) -> None: +def updateCommand(args: argparse.Namespace) -> None: v = Verification() exprs: Dict[str, str] = {} config = read_config_files(args.channels_file) @@ -666,11 +666,11 @@ def main() -> None: 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_pin.set_defaults(func=pinCommand) parser_update = subparsers.add_parser('update') parser_update.add_argument('--dry-run', action='store_true') parser_update.add_argument('channels_file', type=str, nargs='+') - parser_update.set_defaults(func=update) + parser_update.set_defaults(func=updateCommand) args = parser.parse_args() args.func(args)