Support multiple channels

[pinch] / pinch.py

diff --git a/pinch.py b/pinch.py
index 1dbd6679c068ced7cdfdb0162abccd32aa3751ab..0eafb90814516f31b9f17d5c0da1d29c8f0378d0 100644 (file)
--- a/pinch.py
+++ b/pinch.py
@@ -132,8 +132,8 @@ def parse_channel(v: Verification, channel: Channel) -> None:
 
     v.status('Extracting git commit:')
     git_commit_node = d.getElementsByTagName('tt')[0]
-    channel.git_commit = git_commit_node.firstChild.nodeValue
-    v.status(channel.git_commit)
+    channel.git_revision = git_commit_node.firstChild.nodeValue
+    v.status(channel.git_revision)
     v.ok()
     v.status('Verifying git commit label')
     v.result(git_commit_node.previousSibling.nodeValue == 'Git commit ')
@@ -205,7 +205,7 @@ def fetch_resources(v: Verification, channel: Channel) -> None:
     v.status('Verifying git commit on main page matches git commit in table')
     v.result(
         open(
-            channel.table['git-revision'].file).read(999) == channel.git_commit)
+            channel.table['git-revision'].file).read(999) == channel.git_revision)
 
 
 def git_fetch(v: Verification, channel: Channel) -> None:
@@ -228,7 +228,7 @@ def git_fetch(v: Verification, channel: Channel) -> None:
 
     v.status('Checking if we already have this rev:')
     process = subprocess.run(
-        ['git', '-C', channel.git_cachedir, 'cat-file', '-e', channel.git_commit])
+        ['git', '-C', channel.git_cachedir, 'cat-file', '-e', channel.git_revision])
     if process.returncode == 0:
         v.status('yes')
     if process.returncode == 1:
@@ -248,7 +248,7 @@ def git_fetch(v: Verification, channel: Channel) -> None:
         v.result(process.returncode == 0)
         v.status('Verifying that fetch retrieved this rev')
         process = subprocess.run(
-            ['git', '-C', channel.git_cachedir, 'cat-file', '-e', channel.git_commit])
+            ['git', '-C', channel.git_cachedir, 'cat-file', '-e', channel.git_revision])
         v.result(process.returncode == 0)
 
     v.status('Verifying rev is an ancestor of ref')
@@ -257,7 +257,7 @@ def git_fetch(v: Verification, channel: Channel) -> None:
                               channel.git_cachedir,
                               'merge-base',
                               '--is-ancestor',
-                              channel.git_commit,
+                              channel.git_revision,
                               channel.git_ref])
     v.result(process.returncode == 0)
 
@@ -310,7 +310,7 @@ def git_checkout(v: Verification, channel: Channel, dest: str) -> None:
                             '-C',
                             channel.git_cachedir,
                             'archive',
-                            channel.git_commit],
+                            channel.git_revision],
                            stdout=subprocess.PIPE)
     tar = subprocess.Popen(
         ['tar', 'x', '-C', dest, '-f', '-'], stdin=git.stdout)
@@ -330,7 +330,7 @@ def check_channel_metadata(
             os.path.join(
                 channel_contents,
                 channel.release_name,
-                '.git-revision')).read(999) == channel.git_commit)
+                '.git-revision')).read(999) == channel.git_revision)
 
     v.status(
         'Verifying version-suffix is a suffix of release name %s:' %
@@ -363,13 +363,14 @@ def main(argv: List[str]) -> None:
     v = Verification()
     config = configparser.ConfigParser()
     config.read_file(open(argv[1]), argv[1])
-    channel = Channel(**dict(config['nixos'].items()))
-    fetch(v, channel)
-    parse_channel(v, channel)
-    fetch_resources(v, channel)
-    git_fetch(v, channel)
-    check_channel_contents(v, channel)
-    print(channel)
+    for section in config.sections():
+        channel = Channel(**dict(config[section].items()))
+        fetch(v, channel)
+        parse_channel(v, channel)
+        fetch_resources(v, channel)
+        git_fetch(v, channel)
+        check_channel_contents(v, channel)
+        print(channel)
 
 
 main(sys.argv)