From: Ian Jackson <ijackson@chiark.greenend.org.uk>
Date: Sat, 16 May 2015 22:23:37 +0000 (+0100)
Subject: dgit-repos-policy-debian: Fix taint overrides sql (and print it out for debugging)
X-Git-Tag: debian/0.30~170
X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=dgit.git;a=commitdiff_plain;h=9eb0e2a413a683eed5993523f5baedf00fa73467;hp=ca52f4f5f98de5f94128a75a4ae9079fa725e803

dgit-repos-policy-debian: Fix taint overrides sql (and print it out for debugging)
---

diff --git a/infra/dgit-repos-policy-debian b/infra/dgit-repos-policy-debian
index 1e32d391..88759f7f 100755
--- a/infra/dgit-repos-policy-debian
+++ b/infra/dgit-repos-policy-debian
@@ -302,10 +302,11 @@ END
     my ($taintinfoq,$overridesanyq,$untaintq,$overridesq);
 
     my $overridesstmt = <<END;
-        SELECT deliberately FROM taintoverrides WHERE ( 1
+        SELECT deliberately FROM taintoverrides WHERE (
+            1=0
 END
     my @overridesv = sort keys %deliberately;
-    $overridesstmt .= join '', (<<END x @overridesv);
+    $overridesstmt .= <<END foreach @overridesv;
             OR deliberately = ?
 END
     $overridesstmt .= <<END;
@@ -351,6 +352,8 @@ Taint recorded$timeshow for $pkgshow
 Reason: $ti->{comment}
 END
 
+        printdebug "SQL overrides: @overridesv $taintid /\n$overridesstmt\n";
+
         $overridesq ||= $poldbh->prepare($overridesstmt);
 	$overridesq->execute(@overridesv, $taintid);
 	my ($ovwhy) = $overridesq->fetchrow_array();