summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorIan Jackson <ijackson@chiark.greenend.org.uk>2022-12-28 20:39:35 +0000
committerIan Jackson <ijackson@chiark.greenend.org.uk>2022-12-28 23:35:03 +0000
commit6ac9e51b034f7ae125f453fc25dd3aa806d79aca (patch)
tree9226743db22e4fc5fa59f3c19ece754f33cee584
parent36217f56c3b4b10961d4919829e9a1bf21fd90dd (diff)
tainted-objects (fix): Use deliberately()
This will allow the tests to bypass the local checks when they want to. Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
-rwxr-xr-xdgit2
1 files changed, 1 insertions, 1 deletions
diff --git a/dgit b/dgit
index 45c935d..2154065 100755
--- a/dgit
+++ b/dgit
@@ -4570,7 +4570,7 @@ sub tainted_objects_precheck ($$) {
my %taints;
ROW: foreach my $row (@{ decode_json $json }) {
foreach my $override (@{ $row->{overrides} }) {
- if (grep { $_ eq $override } @deliberatelies) {
+ if ($override =~ m{^--deliberately-} && deliberately($')) {
printdebug "overriding $row->{gitobjid} $override\n";
next ROW;
}