X-Git-Url: http://git.scottworley.com/pinch/blobdiff_plain/4a82be40d532c3916b54453b9e238b09721b7994..b3ea39b882d1f48781edff1863181274753b32b5:/pinch.py

diff --git a/pinch.py b/pinch.py
index b76c8da..58f7a32 100644
--- a/pinch.py
+++ b/pinch.py
@@ -101,7 +101,9 @@ class AliasSearchPath(SearchPath):
         assert not hasattr(self, 'git_repo')
 
 
-class TarrableSearchPath(SearchPath):
+# (This lint-disable is for pylint bug https://github.com/PyCQA/pylint/issues/179
+# which is fixed in pylint 2.5.)
+class TarrableSearchPath(SearchPath, ABC):  # pylint: disable=abstract-method
     channel_html: bytes
     channel_url: str
     forwarded_url: str
@@ -111,19 +113,15 @@ class TarrableSearchPath(SearchPath):
     old_git_revision: str
     table: Dict[str, ChannelTableEntry]
 
+
+class GitSearchPath(TarrableSearchPath):
     def pin(self, v: Verification, conf: configparser.SectionProxy) -> None:
         if hasattr(self, 'git_revision'):
             self.old_git_revision = self.git_revision
             del self.git_revision
 
-        if 'channel_url' in conf:
-            pin_channel(v, self)
-            conf['release_name'] = self.release_name
-            conf['tarball_url'] = self.table['nixexprs.tar.xz'].absolute_url
-            conf['tarball_sha256'] = self.table['nixexprs.tar.xz'].digest
-        else:
-            git_fetch(v, self)
-            conf['release_name'] = git_revision_name(v, self)
+        git_fetch(v, self)
+        conf['release_name'] = git_revision_name(v, self)
         conf['git_revision'] = self.git_revision
 
     def fetch(self, v: Verification, section: str,
@@ -133,21 +131,34 @@ class TarrableSearchPath(SearchPath):
                 '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)
 
 
-class GitSearchPath(TarrableSearchPath):
-    pass
+class ChannelSearchPath(TarrableSearchPath):
+    def pin(self, v: Verification, conf: configparser.SectionProxy) -> None:
+        if hasattr(self, 'git_revision'):
+            self.old_git_revision = self.git_revision
+            del self.git_revision
 
+        pin_channel(v, self)
+        conf['release_name'] = self.release_name
+        conf['tarball_url'] = self.table['nixexprs.tar.xz'].absolute_url
+        conf['tarball_sha256'] = self.table['nixexprs.tar.xz'].digest
+        conf['git_revision'] = self.git_revision
 
-class ChannelSearchPath(TarrableSearchPath):
-    pass
+    # Lint TODO: Put tarball_url and tarball_sha256 in ChannelSearchPath
+    # pylint: disable=no-self-use
+    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)
+
+        return fetch_with_nix_prefetch_url(
+            v, conf['tarball_url'], Digest16(
+                conf['tarball_sha256']))
 
 
 def compare(a: str, b: str) -> Tuple[List[str], List[str], List[str]]: