Allow more specific invalid symlinks

At some point, we may want to just examine incomparable files & allow
identically-broken symlinks, rather than explicitly list approved
exceptions here.

diff --git a/Changelog b/Changelog
index b1f8cf16a6054057274ae224c28aff66e0ef3b05..45074673c3602f92df8bc1d59bd7d92b5c9ece05 100644 (file)
--- a/Changelog
+++ b/Changelog
@@ -1,4 +1,5 @@
 ## [Unreleased]
 ## [Unreleased]

+- Allow nixpkgs' additional new intentionally-invalid symlinks

 
 
 ## [3.0.12] - 2023-12-07
 
 
 ## [3.0.12] - 2023-12-07

diff --git a/pinch.py b/pinch.py
index bda7633e398d12e99f018d07d27fe18d1a8f8294..e20d5d18367a7aef413c230b73d324598ddbaa3f 100644 (file)
--- a/pinch.py
+++ b/pinch.py
@@ -432,6 +432,8 @@ def compare_tarball_and_git(
         'programs.sqlite',
         'svn-revision']
     permitted_errors = [
         'programs.sqlite',
         'svn-revision']
     permitted_errors = [

+        'pkgs/test/nixpkgs-check-by-name/tests/multiple-failures/pkgs/by-name/A/fo@/foo',
+        'pkgs/test/nixpkgs-check-by-name/tests/symlink-invalid/pkgs/by-name/fo/foo/foo',

         'pkgs/test/nixpkgs-check-by-name/tests/symlink-invalid/pkgs/by-name/fo/foo/foo.nix',
     ]
     benign_expected_errors = []
         'pkgs/test/nixpkgs-check-by-name/tests/symlink-invalid/pkgs/by-name/fo/foo/foo.nix',
     ]
     benign_expected_errors = []