Show filename being hashed

This is handy for identifying which file is corrupt in the nix store.

diff --git a/Changelog b/Changelog
index 04655b388fea6e799252a13af6a5f41519de11d5..0f0dc747be40593c21c95847121eb951fcb01366 100644 (file)
--- a/Changelog
+++ b/Changelog
@@ -1,4 +1,6 @@
 ## [Unreleased]
 ## [Unreleased]

+### Changed
+- Show filename being hashed.  Helps find nix store corruption.

 
 
 ## [3.0.4] - 2021-06-07
 
 
 ## [3.0.4] - 2021-06-07

diff --git a/pinch.py b/pinch.py
index 9555d74567f7b27ea76cb700beb87a31ed1db0b8..18055dc9a00d9f2190e8b9ab101a8a16a27b66c6 100644 (file)
--- a/pinch.py
+++ b/pinch.py
@@ -351,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)