.gitignore

[pinch] / pinch.py

diff --git a/pinch.py b/pinch.py
index ec6e8b587dc8014e89562f6431f8b57b8dad3fba..dd707180d0ff474a2af30d649a98a44c80be32ca 100644 (file)
--- a/pinch.py
+++ b/pinch.py
@@ -27,6 +27,7 @@ Digest32 = NewType('Digest32', str)
 
 
 class ChannelTableEntry(types.SimpleNamespace):
+    absolute_url: str
     digest: Digest16
     file: str
     size: int
@@ -200,8 +201,10 @@ def fetch_with_nix_prefetch_url(
 def fetch_resources(v: Verification, channel: Channel) -> None:
     for resource in ['git-revision', 'nixexprs.tar.xz']:
         fields = channel.table[resource]
-        url = urllib.parse.urljoin(channel.forwarded_url, fields.url)
-        fields.file = fetch_with_nix_prefetch_url(v, url, fields.digest)
+        fields.absolute_url = urllib.parse.urljoin(
+            channel.forwarded_url, fields.url)
+        fields.file = fetch_with_nix_prefetch_url(
+            v, fields.absolute_url, fields.digest)
     v.status('Verifying git commit on main page matches git commit in table')
     v.result(
         open(
@@ -363,13 +366,18 @@ 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)
+        config[section]['git_rev'] = channel.git_revision
+        config[section]['tarball_url'] = channel.table['nixexprs.tar.xz'].absolute_url
+        config[section]['tarball_sha256'] = channel.table['nixexprs.tar.xz'].digest
+    with open(argv[1], 'w') as configfile:
+        config.write(configfile)
 
 
 main(sys.argv)