diff options
| author | Ian Jackson <ijackson@chiark.greenend.org.uk> | 2022-12-28 19:16:28 +0000 |
|---|---|---|
| committer | Ian Jackson <ijackson@chiark.greenend.org.uk> | 2022-12-28 20:08:38 +0000 |
| commit | 95dc0dca301a9b95bb5fdb3c18bd5f1c4908407e (patch) | |
| tree | b7d92042734d03b0063c6a62a2e0f74a667fcf0d | |
| parent | d80decbb9e922845486e983c2433347354bc4cd7 (diff) | |
tainted-objects (cleanup): Use common message generator in dgit
The messages now come out the same.
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
| -rwxr-xr-x | dgit | 17 | ||||
| -rwxr-xr-x | tests/tests/debpolicy-taintrm | 8 |
2 files changed, 12 insertions, 13 deletions
@@ -4594,16 +4594,15 @@ END my ($objid) = @_; 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 { - print STDERR f_ " not overrideable: %s\n", - $row->{comment}; - } + # If it was actually overridding we don't get here, asd + # don't call tainted_objects_message. Instead, the server + # will send such a message to our stderr (sadly, untranslated). + my $ovstatus = + (grep m{^--deliberately-}, @{ $row->{overrides} }) + ? '' : undef; + print STDERR tainted_objects_message $row, $ovstatus; $trouble = 1; my $hint = $row->{hint}; if (defined $hint and !$hinted{$hint}++) { diff --git a/tests/tests/debpolicy-taintrm b/tests/tests/debpolicy-taintrm index cab79ea..70ca165 100755 --- a/tests/tests/debpolicy-taintrm +++ b/tests/tests/debpolicy-taintrm @@ -39,13 +39,13 @@ t-commit 'edit after cut' : push, needs --deliberately t-expect-push-fail-tainted \ - ' overrideable .* all previously pushed versions were found to have been removed from NEW' \ - 'remote: .* all previously pushed versions were found to have been removed from NEW' \ + 'Reason:.* all previously pushed versions were found to have been removed from NEW' \ + 'remote: Reason:.* all previously pushed versions were found to have been removed from NEW' \ t-dgit push-source --new t-expect-push-fail-tainted \ - ' overrideable .* all previously pushed versions were found to have been removed from NEW' \ - 'remote: .* all previously pushed versions were found to have been removed from NEW' \ + 'Reason:.* all previously pushed versions were found to have been removed from NEW' \ + 'remote: Reason:.* all previously pushed versions were found to have been removed from NEW' \ t-dgit push-source --new --deliberately-not-fast-forward \ --force-reusing-version |