From: Ian Jackson <ijackson@chiark.greenend.org.uk>
Date: Sat, 5 Jan 2019 23:27:01 +0000 (+0000)
Subject: dgit-repos-policy-debian: Remove duplicated text from force message
X-Git-Tag: archive/debian/8.3~31
X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=commitdiff_plain;h=37b5c1d305b5b7362e83ea4cbfdab4b9544031d3;p=dgit.git

dgit-repos-policy-debian: Remove duplicated text from force message

$ovwhy is from SELECT deliberately ... WHERE ... OR deliberately = ?
where ? is a key in %deliberately which came from the command line
where it already contains --deliberately=.

Closes: #913676
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
---

diff --git a/infra/dgit-repos-policy-debian b/infra/dgit-repos-policy-debian
index e85e92c5..f7e5e53b 100755
--- a/infra/dgit-repos-policy-debian
+++ b/infra/dgit-repos-policy-debian
@@ -461,7 +461,7 @@ END
             $mustreject = 1;
 	} else {
 	    $stderr .= <<END;
-Forcing due to --deliberately-$ovwhy
+Forcing due to $ovwhy
 END
             $untaintq ||= $poldbh->prepare(<<END);
                 DELETE FROM taints WHERE taint_id = ?