From b17def3f6b3c3f002d1bf7ef7d838110374d015d Mon Sep 17 00:00:00 2001 From: Scott Worley Date: Thu, 9 Apr 2020 20:35:24 -0700 Subject: [PATCH 1/1] Rename config field: url -> channel_url --- channels | 2 +- pinch.py | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/channels b/channels index d90c172..3f48dcc 100644 --- a/channels +++ b/channels @@ -1,4 +1,4 @@ [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 diff --git a/pinch.py b/pinch.py index dd70718..e3b6882 100644 --- a/pinch.py +++ b/pinch.py @@ -36,6 +36,7 @@ class ChannelTableEntry(types.SimpleNamespace): class Channel(types.SimpleNamespace): channel_html: bytes + channel_url: 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] - url: str 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') - 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) - 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: @@ -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.url.encode())) + channel.git_repo.encode())) if not os.path.exists(channel.git_cachedir): v.status("Initializing git repo") process = subprocess.run( -- 2.44.1