summaryrefslogtreecommitdiff
path: root/dgit-repos-server
diff options
context:
space:
mode:
Diffstat (limited to 'dgit-repos-server')
-rwxr-xr-xdgit-repos-server18
1 files changed, 13 insertions, 5 deletions
diff --git a/dgit-repos-server b/dgit-repos-server
index 8d82186..11e4569 100755
--- a/dgit-repos-server
+++ b/dgit-repos-server
@@ -149,7 +149,7 @@ sub mkrepotmp () {
die $!;
}
-sub reject ($) {
+sub recordreject ($) {
my ($why) = @_;
my $w = $ENV{'DGIT_DRS_WORK'}; # we are in stunthook
if (defined $w) {
@@ -157,6 +157,11 @@ sub reject ($) {
print REJ $why, "\n" or die $!;
close REJ or die $!;
}
+}
+
+sub reject ($) {
+ my ($why) = @_;
+ recordreject $why;
die "dgit-repos-server: reject: $why\n";
}
@@ -344,13 +349,16 @@ sub checksig_keyring ($) {
debug " checksig keyring $keyringfile...";
- open P, "-|", (qw(gpgv --status-fd=1 --keyring),
+ our @cmd = (qw(gpgv --status-fd=1 --keyring),
$keyringfile,
- qw(dgit-tmp/plaintext.asc dgit-tmp/plaintext))
+ qw(dgit-tmp/plaintext.asc dgit-tmp/plaintext));
+ debugcmd @cmd;
+
+ open P, "-|", @cmd
or die $!;
while (<P>) {
- next unless s/^\[GNUPG:\]: //;
+ next unless s/^\[GNUPG:\] //;
chomp or die;
debug " checksig| $_";
my @l = split / /, $_;
@@ -425,7 +433,7 @@ sub verifytag () {
}
sub checksuite () {
- debug "checksuite";
+ debug "checksuite ($suitesfile)";
open SUITES, "<", $suitesfile or die $!;
while (<SUITES>) {
chomp;