Start on 3.0.0

[pinch] / pinch.py

diff --git a/pinch.py b/pinch.py
index 37d37a7c137727bed59251a0b0b1619f19cbeab7..ed33c928ae6a466c5e27a70ccf2a52d592bc8bc8 100644 (file)
--- a/pinch.py
+++ b/pinch.py
@@ -124,7 +124,16 @@ def copy_to_nix_store(v: Verification, filename: str) -> str:
     process = subprocess.run(
         ['nix-store', '--add', filename], stdout=subprocess.PIPE)
     v.result(process.returncode == 0)
-    return process.stdout.decode().strip()
+    return process.stdout.decode().strip()  # type: ignore  # (for old mypy)
+
+
+def symlink_archive(v: Verification, path: str) -> str:
+    with tempfile.TemporaryDirectory() as td:
+        archive_filename = os.path.join(td, 'link.tar.gz')
+        os.symlink(path, os.path.join(td, 'link'))
+        with tarfile.open(archive_filename, mode='x:gz') as t:
+            t.add(os.path.join(td, 'link'), arcname='link')
+        return copy_to_nix_store(v, archive_filename)
 
 
 class AliasSearchPath(NamedTuple):
@@ -143,12 +152,7 @@ class SymlinkSearchPath(NamedTuple):
         return SymlinkPin()
 
     def fetch(self, v: Verification, _: Pin) -> str:
-        with tempfile.TemporaryDirectory() as td:
-            archive_filename = os.path.join(td, 'link.tar.gz')
-            os.symlink(self.path, os.path.join(td, 'link'))
-            with tarfile.open(archive_filename, mode='x:gz') as t:
-                t.add(os.path.join(td, 'link'), arcname='link')
-            return copy_to_nix_store(v, archive_filename)
+        return symlink_archive(v, self.path)
 
 
 class GitSearchPath(NamedTuple):
@@ -182,6 +186,8 @@ class ChannelSearchPath(NamedTuple):
 
         channel_html, forwarded_url = fetch_channel(v, self)
         table, new_gitpin = parse_channel(v, channel_html)
+        if old_pin is not None and old_pin.git_revision == new_gitpin.git_revision:
+            return old_pin
         fetch_resources(v, new_gitpin, forwarded_url, table)
         ensure_git_rev_available(v, self, new_gitpin, old_revision)
         check_channel_contents(v, self, table, new_gitpin)
@@ -238,7 +244,7 @@ def fetch_channel(
         v: Verification, channel: ChannelSearchPath) -> Tuple[str, str]:
     v.status('Fetching channel')
     request = urllib.request.urlopen(channel.channel_url, timeout=10)
-    channel_html = request.read()
+    channel_html = request.read().decode()
     forwarded_url = request.geturl()
     v.result(request.status == 200)  # type: ignore  # (for old mypy)
     v.check('Got forwarded', channel.channel_url != forwarded_url)
@@ -651,7 +657,7 @@ def read_config_section(
     pin_fields, remaining_fields = filter_dict(all_fields, set(P._fields))
     # Error suppression works around https://github.com/python/mypy/issues/9007
     pin_present = pin_fields != {} or P._fields == ()
-    pin = P(**pin_fields) if pin_present else None  # type:ignore[call-arg]
+    pin = P(**pin_fields) if pin_present else None  # type: ignore
     return SP(**remaining_fields), pin
 
 
@@ -723,8 +729,7 @@ def updateCommand(args: argparse.Namespace) -> None:
     command = [
         'nix-env',
         '--profile',
-        '/nix/var/nix/profiles/per-user/%s/channels' %
-        getpass.getuser(),
+        args.profile,
         '--show-trace',
         '--file',
         '<nix/unpack-channel.nix>',
@@ -747,6 +752,8 @@ def main() -> None:
     parser_pin.set_defaults(func=pinCommand)
     parser_update = subparsers.add_parser('update')
     parser_update.add_argument('--dry-run', action='store_true')
+    parser_update.add_argument('--profile', default=(
+        '/nix/var/nix/profiles/per-user/%s/channels' % getpass.getuser()))
     parser_update.add_argument('channels_file', type=str, nargs='+')
     parser_update.set_defaults(func=updateCommand)
     args = parser.parse_args()