chiark / gitweb /
Split brain: Do not look at all of %INC for cache key
authorIan Jackson <ijackson@chiark.greenend.org.uk>
Sat, 16 Jul 2016 17:19:36 +0000 (18:19 +0100)
committerIan Jackson <ijackson@chiark.greenend.org.uk>
Sun, 17 Jul 2016 12:46:14 +0000 (13:46 +0100)
Look only at dgit and Debian/Dgit.

The prompt for this is that some of our submodules seem to dynamically
load some of their components depending on what dgit does, making the
cache key unstable.

dgit

diff --git a/dgit b/dgit
index 1e6be23d9ae21e9aac8d0018cf923ba4b4bb747f..a5685375caf02def49d22c0e93033ffec0568a11 100755 (executable)
--- a/dgit
+++ b/dgit
@@ -3015,6 +3015,7 @@ sub quilt_check_splitbrain_cache ($$) {
     my $srcshash = Digest::SHA->new(256);
     my %sfs = ( %INC, '$0(dgit)' => $0 );
     foreach my $sfk (sort keys %sfs) {
+       next unless m/^\$0\b/ || m{^Debian/Dgit\b};
        $srcshash->add($sfk,"  ");
        $srcshash->add(hashfile($sfs{$sfk}));
        $srcshash->add("\n");