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>

1 files changed, 8 insertions, 9 deletions

diff --git a/dgit b/dgit
index c51f75e..10773dc 100755
--- a/dgit
+++ b/dgit
@@ -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}++) {