Deprecation notice

[pinch] / pinch.py

diff --git a/pinch.py b/pinch.py
index c26070b17ee00eac25b191454f32f54b45e58b3c..130f69a8daeb86fc6521de878da3014075f8b16d 100644 (file)
--- a/pinch.py
+++ b/pinch.py
@@ -247,7 +247,7 @@ def compare(a: str, b: str) -> Tuple[List[str], List[str], List[str]]:
 
 def fetch_channel(
         v: Verification, channel: ChannelSearchPath) -> Tuple[str, str]:
 
 def fetch_channel(
         v: Verification, channel: ChannelSearchPath) -> Tuple[str, str]:

-    v.status('Fetching channel')
+    v.status('Fetching channel from %s' % channel.channel_url)

     request = urllib.request.urlopen(channel.channel_url, timeout=10)
     channel_html = request.read().decode()
     forwarded_url = request.geturl()
     request = urllib.request.urlopen(channel.channel_url, timeout=10)
     channel_html = request.read().decode()
     forwarded_url = request.geturl()


@@ -302,18 +302,17 @@ def digest_file(filename: str) -> Digest16:
     return Digest16(hasher.hexdigest())
 
 
     return Digest16(hasher.hexdigest())
 
 

-_experimental_flag_needed = None
+@functools.lru_cache
+def _experimental_flag_needed(v: Verification) -> bool:
+    v.status('Checking Nix version')
+    process = subprocess.run(['nix', '--help'], stdout=subprocess.PIPE)
+    v.result(process.returncode == 0)
+    return b'--experimental-features' in process.stdout

 
 
 def _nix_command(v: Verification) -> List[str]:
 
 
 def _nix_command(v: Verification) -> List[str]:

-    global _experimental_flag_needed
-    if _experimental_flag_needed is None:
-        v.status('Checking Nix version')
-        process = subprocess.run(['nix', '--help'], stdout=subprocess.PIPE)
-        v.result(process.returncode == 0)
-        _experimental_flag_needed = b'--experimental-features' in process.stdout

     return ['nix', '--experimental-features',
     return ['nix', '--experimental-features',

-            'nix-command'] if _experimental_flag_needed else ['nix']
+            'nix-command'] if _experimental_flag_needed(v) else ['nix']

 
 
 def to_Digest16(v: Verification, digest32: Digest32) -> Digest16:
 
 
 def to_Digest16(v: Verification, digest32: Digest32) -> Digest16:


@@ -352,7 +351,7 @@ def fetch_with_nix_prefetch_url(
     assert empty == ''
     v.check("Verifying nix-prefetch-url's digest",
             to_Digest16(v, Digest32(prefetch_digest)) == digest)
     assert empty == ''
     v.check("Verifying nix-prefetch-url's digest",
             to_Digest16(v, Digest32(prefetch_digest)) == digest)

-    v.status("Verifying file digest")
+    v.status("Verifying digest of %s" % path)

     file_digest = digest_file(path)
     v.result(file_digest == digest)
     return path  # type: ignore  # (for old mypy)
     file_digest = digest_file(path)
     v.result(file_digest == digest)
     return path  # type: ignore  # (for old mypy)