diff options
author | Ian Jackson <ijackson@chiark.greenend.org.uk> | 2014-01-29 18:53:43 +0000 |
---|---|---|
committer | Ian Jackson <ijackson@chiark.greenend.org.uk> | 2014-03-05 18:29:06 +0000 |
commit | ae269e862c21b2806e1039fb69c4ef9f67bb13b6 (patch) | |
tree | 8bcf2c37157badf2768c4121305789aeb1eab2ab | |
parent | 9e29c169cb066eb1636fbf0ef0a319c7151dea21 (diff) |
dgit-repos-server: wip fixes
-rwxr-xr-x | dgit-repos-server | 18 |
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; |