Duplicate searchpath checking in one place

diff --git a/pinch.py b/pinch.py
index 7049b69134f7ac114c58d815662c221817972c37..26982260cc62c5f485175c6ee77e84868909a0a5 100644 (file)
--- a/pinch.py
+++ b/pinch.py
@@ -537,6 +537,18 @@ def read_config(filename: str) -> configparser.ConfigParser:
     return config
 
 
     return config
 
 

+def read_config_files(
+        filenames: Iterable[str]) -> Dict[str, configparser.SectionProxy]:
+    merged_config: Dict[str, configparser.SectionProxy] = {}
+    for file in filenames:
+        config = read_config(file)
+        for section in config.sections():
+            if section in merged_config:
+                raise Exception('Duplicate channel "%s"' % section)
+            merged_config[section] = config[section]
+    return merged_config
+
+

 def pin(args: argparse.Namespace) -> None:
     v = Verification()
     config = read_config(args.channels_file)
 def pin(args: argparse.Namespace) -> None:
     v = Verification()
     config = read_config(args.channels_file)


@@ -554,28 +566,21 @@ def pin(args: argparse.Namespace) -> None:
 
 def update(args: argparse.Namespace) -> None:
     v = Verification()
 
 def update(args: argparse.Namespace) -> None:
     v = Verification()

-    config = configparser.ConfigParser()

     exprs: Dict[str, str] = {}
     exprs: Dict[str, str] = {}

-    configs = [read_config(filename) for filename in args.channels_file]
-    for config in configs:
-        for section in config.sections():
-            if 'alias_of' in config[section]:
-                assert 'git_repo' not in config[section]
-                continue
-            sp = read_search_path(config[section])
-            tarball = sp.fetch(v, section, config[section])
-            if section in exprs:
-                raise Exception('Duplicate channel "%s"' % section)
-            exprs[section] = (
-                'f: f { name = "%s"; channelName = "%%s"; src = builtins.storePath "%s"; }' %
-                (config[section]['release_name'], tarball))
-
-    for config in configs:
-        for section in config.sections():
-            if 'alias_of' in config[section]:
-                if section in exprs:
-                    raise Exception('Duplicate channel "%s"' % section)
-                exprs[section] = exprs[str(config[section]['alias_of'])]
+    config = read_config_files(args.channels_file)
+    for section in config:
+        if 'alias_of' in config[section]:
+            assert 'git_repo' not in config[section]
+            continue
+        sp = read_search_path(config[section])
+        tarball = sp.fetch(v, section, config[section])
+        exprs[section] = (
+            'f: f { name = "%s"; channelName = "%%s"; src = builtins.storePath "%s"; }' %
+            (config[section]['release_name'], tarball))
+
+    for section in config:
+        if 'alias_of' in config[section]:
+            exprs[section] = exprs[str(config[section]['alias_of'])]

 
     command = [
         'nix-env',
 
     command = [
         'nix-env',