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.pm: git_for_each_tag_referring provides referred-to object id too
[dgit.git]
/
infra
/
dgit-repos-server
diff --git
a/infra/dgit-repos-server
b/infra/dgit-repos-server
index 634f91edab17ee52103433f1e1790f3f92b14dba..f700df81ca1f507e711afff2bceea5097919f0ee 100755
(executable)
--- a/
infra/dgit-repos-server
+++ b/
infra/dgit-repos-server
@@
-9,7
+9,7
@@
# --suites=SUITES-FILE default DISTRO-DIR/suites
# --policy-hook=POLICY-HOOK default DISTRO-DIR/policy-hook
# --dgit-live=DGIT-LIVE-DIR default DISTRO-DIR/dgit-live
# --suites=SUITES-FILE default DISTRO-DIR/suites
# --policy-hook=POLICY-HOOK default DISTRO-DIR/policy-hook
# --dgit-live=DGIT-LIVE-DIR default DISTRO-DIR/dgit-live
-# (DISTRO-DIR is not used other than as default)
+# (DISTRO-DIR is not used other than as default
and to pass to policy hook
)
# internal usage:
# .../dgit-repos-server --pre-receive-hook PACKAGE
#
# internal usage:
# .../dgit-repos-server --pre-receive-hook PACKAGE
#
@@
-117,7
+117,7
@@
$SIG{__WARN__} = sub { die $_[0]; };
# cleanup to do
#
# Policy hook script is invoked like this:
# cleanup to do
#
# Policy hook script is invoked like this:
-# POLICY-HOOK-SCRIPT DISTRO DGIT-REPOS-DIR DGIT-LIVE-DIR ACTION...
+# POLICY-HOOK-SCRIPT DISTRO DGIT-REPOS-DIR DGIT-LIVE-DIR
DISTRO-DIR
ACTION...
# ie.
# POLICY-HOOK-SCRIPT ... check-list [...]
# POLICY-HOOK-SCRIPT ... check-package PACKAGE [...]
# ie.
# POLICY-HOOK-SCRIPT ... check-list [...]
# POLICY-HOOK-SCRIPT ... check-package PACKAGE [...]
@@
-179,6
+179,7
@@
our $distro;
our $suitesfile;
our $policyhook;
our $dgitlive;
our $suitesfile;
our $policyhook;
our $dgitlive;
+our $distrodir;
our $destrepo;
our $workrepo;
our $keyrings;
our $destrepo;
our $workrepo;
our $keyrings;
@@
-270,11
+271,11
@@
sub policyhook {
my ($policyallowbits, @polargs) = @_;
# => ($exitstatuspolicybitmap);
die if $policyallowbits & ~0x3e;
my ($policyallowbits, @polargs) = @_;
# => ($exitstatuspolicybitmap);
die if $policyallowbits & ~0x3e;
- my @cmd = ($policyhook,$distro,$dgitrepos,$dgitlive,@polargs);
+ my @cmd = ($policyhook,$distro,$dgitrepos,$dgitlive,
$distrodir,
@polargs);
debugcmd '+',@cmd;
my $r = system @cmd;
die "system: $!" if $r < 0;
debugcmd '+',@cmd;
my $r = system @cmd;
die "system: $!" if $r < 0;
- die "
hook (".(shellquote @cmd).") failed ($?)
"
+ die "
dgit-repos-server: policy hook failed (or rejected) ($?)\n
"
if $r & ~($policyallowbits << 8);
printdebug sprintf "hook => %#x\n", $r;
return $r >> 8;
if $r & ~($policyallowbits << 8);
printdebug sprintf "hook => %#x\n", $r;
return $r >> 8;
@@
-498,7
+499,7
@@
sub parsetag () {
while (length) {
if (s/^distro\=(\S+) //) {
die "$1 != $distro" unless $1 eq $distro;
while (length) {
if (s/^distro\=(\S+) //) {
die "$1 != $distro" unless $1 eq $distro;
- } elsif (s/^(--deliberately-$
package
_re) //) {
+ } elsif (s/^(--deliberately-$
deliberately
_re) //) {
push @deliberatelies, $1;
} elsif (s/^supersede:(\S+)=(\w+) //) {
die "supersede $1 twice" if defined $supersedes{$1};
push @deliberatelies, $1;
} elsif (s/^supersede:(\S+)=(\w+) //) {
die "supersede $1 twice" if defined $supersedes{$1};
@@
-679,7
+680,7
@@
sub checktagnoreplay () {
my @problems;
git_for_each_tag_referring($onlyreferring, sub {
my @problems;
git_for_each_tag_referring($onlyreferring, sub {
- my ($objid,$fullrefname,$tagname) = @_;
+ my ($objid,$
refobjid,$
fullrefname,$tagname) = @_;
printdebug "checktagnoreplay - overwriting $fullrefname=$objid\n";
my $supers = $supersedes{$fullrefname};
if (!defined $supers) {
printdebug "checktagnoreplay - overwriting $fullrefname=$objid\n";
my $supers = $supersedes{$fullrefname};
if (!defined $supers) {
@@
-821,7
+822,8
@@
our %indistrodir = (
'dgit-live' => \$dgitlive,
);
'dgit-live' => \$dgitlive,
);
-our @hookenvs = qw(distro suitesfile policyhook dgitlive keyrings dgitrepos);
+our @hookenvs = qw(distro suitesfile policyhook
+ dgitlive keyrings dgitrepos distrodir);
# workrepo and destrepo handled ad-hoc
# workrepo and destrepo handled ad-hoc
@@
-918,9
+920,9
@@
sub parseargsdispatch () {
exit 0;
}
exit 0;
}
- $distro
= $ENV{'DGIT_DRS_DISTRO'}
= argval();
-
my $distrodir
= argval();
- $keyrings
= $ENV{'DGIT_DRS_KEYRINGS'}
= argval();
+ $distro = argval();
+
$distrodir
= argval();
+ $keyrings = argval();
foreach my $dk (keys %indistrodir) {
${ $indistrodir{$dk} } = "$distrodir/$dk";
foreach my $dk (keys %indistrodir) {
${ $indistrodir{$dk} } = "$distrodir/$dk";