Rename config field: url -> channel_url

diff --git a/channels b/channels
index d90c172f65bb1ff15a929aed90adf88534eeb57c..3f48dcc87c55c0b5093353a1342c1e03f2bc6f20 100644 (file)
--- a/channels
+++ b/channels
@@ -1,4 +1,4 @@
 [nixos]
 [nixos]

-url = https://channels.nixos.org/nixos-20.03
+channel_url = https://channels.nixos.org/nixos-20.03

 git_repo = https://github.com/NixOS/nixpkgs.git
 git_ref = nixos-20.03
 git_repo = https://github.com/NixOS/nixpkgs.git
 git_ref = nixos-20.03

diff --git a/pinch.py b/pinch.py
index dd707180d0ff474a2af30d649a98a44c80be32ca..e3b6882bb9fb1ffb6e08cd32c0363fb9b96251a8 100644 (file)
--- a/pinch.py
+++ b/pinch.py
@@ -36,6 +36,7 @@ class ChannelTableEntry(types.SimpleNamespace):
 
 class Channel(types.SimpleNamespace):
     channel_html: bytes
 
 class Channel(types.SimpleNamespace):
     channel_html: bytes

+    channel_url: str

     forwarded_url: str
     git_cachedir: str
     git_ref: str
     forwarded_url: str
     git_cachedir: str
     git_ref: str


@@ -43,7 +44,6 @@ class Channel(types.SimpleNamespace):
     git_revision: str
     release_name: str
     table: Dict[str, ChannelTableEntry]
     git_revision: str
     release_name: str
     table: Dict[str, ChannelTableEntry]

-    url: str

 
 
 class VerificationError(Exception):
 
 
 class VerificationError(Exception):


@@ -111,11 +111,11 @@ def compare(a: str, b: str) -> Tuple[List[str], List[str], List[str]]:
 
 def fetch(v: Verification, channel: Channel) -> None:
     v.status('Fetching channel')
 
 def fetch(v: Verification, channel: Channel) -> None:
     v.status('Fetching channel')

-    request = urllib.request.urlopen(channel.url, timeout=10)
+    request = urllib.request.urlopen(channel.channel_url, timeout=10)

     channel.channel_html = request.read()
     channel.forwarded_url = request.geturl()
     v.result(request.status == 200)
     channel.channel_html = request.read()
     channel.forwarded_url = request.geturl()
     v.result(request.status == 200)

-    v.check('Got forwarded', channel.url != channel.forwarded_url)
+    v.check('Got forwarded', channel.channel_url != channel.forwarded_url)

 
 
 def parse_channel(v: Verification, channel: Channel) -> None:
 
 
 def parse_channel(v: Verification, channel: Channel) -> None:


@@ -222,7 +222,7 @@ def git_fetch(v: Verification, channel: Channel) -> None:
     channel.git_cachedir = os.path.expanduser(
         '~/.cache/nix-pin-channel/git/%s' %
         digest_string(
     channel.git_cachedir = os.path.expanduser(
         '~/.cache/nix-pin-channel/git/%s' %
         digest_string(

-            channel.url.encode()))
+            channel.git_repo.encode()))

     if not os.path.exists(channel.git_cachedir):
         v.status("Initializing git repo")
         process = subprocess.run(
     if not os.path.exists(channel.git_cachedir):
         v.status("Initializing git repo")
         process = subprocess.run(