Introduce read_search_path()

diff --git a/pinch.py b/pinch.py
index 0c0103b2ece62df9c9b1ecbee8bf5fdb2d42a812..cc653daccb8aaa0d4ce74a80b685a949ab563043 100644 (file)
--- a/pinch.py
+++ b/pinch.py
@@ -493,6 +493,10 @@ def git_revision_name(v: Verification, channel: Channel) -> str:
                       process.stdout.decode().strip())
 
 
                       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)
 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
 
         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')
 
         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']))
 
             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)
 
     ensure_git_rev_available(v, channel)
     return git_get_tarball(v, channel)