From f8f5b12546942d8d801f3cda70c798d4a4e4ae13 Mon Sep 17 00:00:00 2001 From: Scott Worley Date: Fri, 12 Jun 2020 23:19:28 -0700 Subject: [PATCH] Introduce read_search_path() --- pinch.py | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/pinch.py b/pinch.py index 0c0103b..cc653da 100644 --- a/pinch.py +++ b/pinch.py @@ -493,6 +493,10 @@ def git_revision_name(v: Verification, channel: Channel) -> str: process.stdout.decode().strip()) +def read_search_path(conf: configparser.SectionProxy) -> Channel: + return Channel(**dict(conf.items())) + + def read_config(filename: str) -> configparser.ConfigParser: config = configparser.ConfigParser() config.read_file(open(filename), filename) @@ -506,7 +510,7 @@ def pin(args: argparse.Namespace) -> None: if args.channels and section not in args.channels: continue - channel = Channel(**dict(config[section].items())) + channel = read_search_path(config[section]) if hasattr(channel, 'alias_of'): assert not hasattr(channel, 'git_repo') @@ -544,7 +548,7 @@ def fetch_channel( v, conf['tarball_url'], Digest16( conf['tarball_sha256'])) - channel = Channel(**dict(conf.items())) + channel = read_search_path(conf) ensure_git_rev_available(v, channel) return git_get_tarball(v, channel) -- 2.44.1