From: Scott Worley <scottworley@scottworley.com>
Date: Sat, 13 Jun 2020 06:43:06 +0000 (-0700)
Subject: Make fetch_channel a Channel method
X-Git-Tag: 2.0.0~29
X-Git-Url: http://git.scottworley.com/pinch/commitdiff_plain/93d2dafe3922ef5230ae41f759563fa5c3aa180e

Make fetch_channel a Channel method
---

diff --git a/pinch.py b/pinch.py
index d346a14..632994b 100644
--- a/pinch.py
+++ b/pinch.py
@@ -119,6 +119,21 @@ class Channel(SearchPath):
             conf['release_name'] = git_revision_name(v, self)
         conf['git_revision'] = self.git_revision
 
+    def fetch(self, v: Verification, section: str,
+              conf: configparser.SectionProxy) -> str:
+        if 'git_repo' not in conf or 'release_name' not in conf:
+            raise Exception(
+                'Cannot update unpinned channel "%s" (Run "pin" before "update")' %
+                section)
+
+        if 'channel_url' in conf:
+            return fetch_with_nix_prefetch_url(
+                v, conf['tarball_url'], Digest16(
+                    conf['tarball_sha256']))
+
+        ensure_git_rev_available(v, self)
+        return git_get_tarball(v, self)
+
 
 def compare(a: str, b: str) -> Tuple[List[str], List[str], List[str]]:
 
@@ -537,25 +552,6 @@ def pin(args: argparse.Namespace) -> None:
         config.write(configfile)
 
 
-def fetch_channel(
-        v: Verification,
-        section: str,
-        conf: configparser.SectionProxy) -> str:
-    if 'git_repo' not in conf or 'release_name' not in conf:
-        raise Exception(
-            'Cannot update unpinned channel "%s" (Run "pin" before "update")' %
-            section)
-
-    if 'channel_url' in conf:
-        return fetch_with_nix_prefetch_url(
-            v, conf['tarball_url'], Digest16(
-                conf['tarball_sha256']))
-
-    channel = read_search_path(conf)
-    ensure_git_rev_available(v, channel)
-    return git_get_tarball(v, channel)
-
-
 def update(args: argparse.Namespace) -> None:
     v = Verification()
     config = configparser.ConfigParser()
@@ -566,7 +562,8 @@ def update(args: argparse.Namespace) -> None:
             if 'alias_of' in config[section]:
                 assert 'git_repo' not in config[section]
                 continue
-            tarball = fetch_channel(v, section, config[section])
+            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] = (