chiark
/
gitweb
/
~ianmdlvl
/
dgit.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
9e29c16
)
dgit-repos-server: wip fixes
author
Ian Jackson
<ijackson@chiark.greenend.org.uk>
Wed, 29 Jan 2014 18:53:43 +0000
(18:53 +0000)
committer
Ian Jackson
<ijackson@chiark.greenend.org.uk>
Wed, 5 Mar 2014 18:29:06 +0000
(18:29 +0000)
dgit-repos-server
patch
|
blob
|
history
diff --git
a/dgit-repos-server
b/dgit-repos-server
index 8d821861d1db6b02f76fccd16e81ef92a954d6a3..11e4569e72abedb577a5d560f012abc3b4f24251 100755
(executable)
--- a/
dgit-repos-server
+++ b/
dgit-repos-server
@@
-149,7
+149,7
@@
sub mkrepotmp () {
die $!;
}
die $!;
}
-sub reject ($) {
+sub re
cordre
ject ($) {
my ($why) = @_;
my $w = $ENV{'DGIT_DRS_WORK'}; # we are in stunthook
if (defined $w) {
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 $!;
}
print REJ $why, "\n" or die $!;
close REJ or die $!;
}
+}
+
+sub reject ($) {
+ my ($why) = @_;
+ recordreject $why;
die "dgit-repos-server: reject: $why\n";
}
die "dgit-repos-server: reject: $why\n";
}
@@
-344,13
+349,16
@@
sub checksig_keyring ($) {
debug " checksig keyring $keyringfile...";
debug " checksig keyring $keyringfile...";
- o
pen P, "-|",
(qw(gpgv --status-fd=1 --keyring),
+ o
ur @cmd =
(qw(gpgv --status-fd=1 --keyring),
$keyringfile,
$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>) {
or die $!;
while (<P>) {
- next unless s/^\[GNUPG:\]
:
//;
+ next unless s/^\[GNUPG:\] //;
chomp or die;
debug " checksig| $_";
my @l = split / /, $_;
chomp or die;
debug " checksig| $_";
my @l = split / /, $_;
@@
-425,7
+433,7
@@
sub verifytag () {
}
sub checksuite () {
}
sub checksuite () {
- debug "checksuite";
+ debug "checksuite
($suitesfile)
";
open SUITES, "<", $suitesfile or die $!;
while (<SUITES>) {
chomp;
open SUITES, "<", $suitesfile or die $!;
while (<SUITES>) {
chomp;