From: Scott Worley <scottworley@scottworley.com>
Date: Thu, 25 Jan 2024 02:42:46 +0000 (-0800)
Subject: Allow more specific invalid symlinks
X-Git-Tag: v3.0.14~2
X-Git-Url: http://git.scottworley.com/pinch/commitdiff_plain/b7ef1dd6ddcede847ace6ab25fe05cf728cc6a44?hp=2fb219b96b7ebff700cc8ce92d4a4add16104b71

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 b1f8cf1..4507467 100644
--- a/Changelog
+++ b/Changelog
@@ -1,4 +1,5 @@
 ## [Unreleased]
+- Allow nixpkgs' additional new intentionally-invalid symlinks
 
 
 ## [3.0.12] - 2023-12-07
diff --git a/pinch.py b/pinch.py
index bda7633..e20d5d1 100644
--- a/pinch.py
+++ b/pinch.py
@@ -432,6 +432,8 @@ def compare_tarball_and_git(
         '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 = []