chiark
/
gitweb
/
~ianmdlvl
/
dgit.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
dgit-repos-server: wip fixes
[dgit.git]
/
dgit-repos-server
diff --git
a/dgit-repos-server
b/dgit-repos-server
index 8dd36aee27458ca4b97ad9ad4e0dfdb6227c1370..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";
}
@@
-311,7
+316,7
@@
sub parsetag () {
}
}
$!=0; $_=<T>; defined or die $!;
}
}
$!=0; $_=<T>; defined or die $!;
- m/^($package_re) release (\S+) for
(\S+
) \[dgit\]$/ or
+ m/^($package_re) release (\S+) for
\S+ \((\S+)\
) \[dgit\]$/ or
reject "tag message not in expected format";
die unless $1 eq $package;
reject "tag message not in expected format";
die unless $1 eq $package;
@@
-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;
@@
-514,6
+522,9
@@
sub argval () {
sub parseargsdispatch () {
die unless @ARGV;
sub parseargsdispatch () {
die unless @ARGV;
+ delete $ENV{'GIT_DIR'}; # if not run via ssh, our parent git process
+ delete $ENV{'GIT_PREFIX'}; # sets these and they mess things up
+
if ($ENV{'DGIT_DRS_DEBUG'}) {
$debug='=';
open DEBUG, ">&STDERR" or die $!;
if ($ENV{'DGIT_DRS_DEBUG'}) {
$debug='=';
open DEBUG, ">&STDERR" or die $!;