summaryrefslogtreecommitdiff
path: root/dgit
diff options
context:
space:
mode:
authorIan Jackson <ijackson@chiark.greenend.org.uk>2022-12-27 18:27:45 +0000
committerIan Jackson <ijackson@chiark.greenend.org.uk>2022-12-28 12:07:44 +0000
commitbda637a64e7b5c0a74df70a271c4d2a1f02b7d07 (patch)
tree66a3fe2534a0744d8d302ed1e3ffb06127f78348 /dgit
parent23e23a4f14ffa1dbf8ba07f3d2136e2e16f2e1e1 (diff)
policy-client-query: dgit: Mention tainted object type
And change the data structure to support this. Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Diffstat (limited to 'dgit')
-rwxr-xr-xdgit12
1 files changed, 7 insertions, 5 deletions
diff --git a/dgit b/dgit
index f7bfc0f..dedf0e9 100755
--- a/dgit
+++ b/dgit
@@ -4577,7 +4577,8 @@ END
foreach my $override (@{ $row->{overrides} }) {
next ROW if grep { $_ eq $override } @deliberatelies;
}
- push @{ $taints{$objid} }, $row;
+ $taints{$objid}{Type} = $gtype;
+ push @{ $taints{$objid}{Rows} }, $row;
}
open GRL, "-|",
@@ -4587,10 +4588,11 @@ END
my $trouble = 0;
my $found = sub {
my ($objid) = @_;
- my $taints = $taints{$objid};
- return unless $taints && @$taints;
- print STDERR f_ "would want to push tainted object %s\n", $objid;
- foreach my $row (@$taints) {
+ my $t = $taints{$objid};
+ return unless $t;
+ print STDERR f_ "would want to push tainted %s object %s\n",
+ $t->{Type}, $objid;
+ foreach my $row (@{ $t->{Rows} }) {
if (grep m{^--deliberately-}, @{ $row->{overrides} }) {
print STDERR f_ " overrideable (--deliberately): %s\n", $row->{comment};
} else {