diff options
author | Ian Jackson <ijackson@chiark.greenend.org.uk> | 2016-07-16 18:19:36 +0100 |
---|---|---|
committer | Ian Jackson <ijackson@chiark.greenend.org.uk> | 2016-07-17 13:46:14 +0100 |
commit | 80aef61fbb509932af0afcfd2c52281f50c95ca5 (patch) | |
tree | 913d6b7273c4cc174b7a5346f249d2ca6dc96857 | |
parent | 611f11cc4c99ee77b24606ddb43afffe4af681c7 (diff) |
Split brain: Do not look at all of %INC for cache key
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.
-rwxr-xr-x | dgit | 1 |
1 files changed, 1 insertions, 0 deletions
@@ -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"); |