X-Git-Url: http://git.scottworley.com/pinch/blobdiff_plain/567a67835a75aac5522261e1cdccfed319a8087b..d815b199fa1d94ba00cd415a1310e80abc57e3b9:/pinch.py diff --git a/pinch.py b/pinch.py index e1d8d3b..125fa63 100644 --- a/pinch.py +++ b/pinch.py @@ -602,7 +602,7 @@ def filter_dict(d: Dict[K, V], fields: Set[K] return selected, remaining -def read_search_path( +def read_config_section( conf: configparser.SectionProxy) -> Tuple[SearchPath, Optional[Pin]]: mapping: Mapping[str, Tuple[Type[SearchPath], Type[Pin]]] = { 'alias': (AliasSearchPath, AliasPin), @@ -643,7 +643,7 @@ def pinCommand(args: argparse.Namespace) -> None: if args.channels and section not in args.channels: continue - sp, old_pin = read_search_path(config[section]) + sp, old_pin = read_config_section(config[section]) config[section].update(sp.pin(v, old_pin)._asdict()) @@ -656,13 +656,12 @@ def updateCommand(args: argparse.Namespace) -> None: exprs: Dict[str, str] = {} config = read_config_files(args.channels_file) for section in config: - sp, pin = read_search_path(config[section]) + sp, pin = read_config_section(config[section]) if pin is None: raise Exception( 'Cannot update unpinned channel "%s" (Run "pin" before "update")' % section) if isinstance(sp, AliasSearchPath): - assert 'git_repo' not in config[section] continue tarball = sp.fetch(v, pin) exprs[section] = (