# --repos=GIT-REPOS-DIR default DISTRO-DIR/repos/
# --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)
# internal usage:
# .../dgit-repos-server --pre-receive-hook PACKAGE
# mDM.TXT
use strict;
+$SIG{__WARN__} = sub { die $_[0]; };
# DGIT-REPOS-DIR contains:
# git tree (or other object) lock (in acquisition order, outer first)
# cleanup to do
#
# Policy hook script is invoked like this:
-# POLICY-HOOK-SCRIPT DISTRO DGIT-REPOS-DIR ACTION...
+# POLICY-HOOK-SCRIPT DISTRO DGIT-REPOS-DIR DGIT-LIVE-DIR ACTION...
# ie.
# POLICY-HOOK-SCRIPT ... check-list [...]
# POLICY-HOOK-SCRIPT ... check-package PACKAGE [...]
-# POLICY-HOOK-SCRIPT ... push|push-confirm PACKAGE \
+# POLICY-HOOK-SCRIPT ... push PACKAGE \
# VERSION SUITE TAGNAME DELIBERATELIES [...]
+# POLICY-HOOK-SCRIPT ... push-confirm PACKAGE \
+# VERSION SUITE TAGNAME DELIBERATELIES FRESH-REPO|'' [...]
#
# Exit status is a bitmask. Bit weight constants are defined in Dgit.pm.
# NOFFCHECK (2)
# to-be-pushed objects have been received; TAGNAME is the
# version-based tag
#
+# FRESH-REPO is '' iff the repo for this package already existed, or
+# the pathname of the newly-created repo which will be renamed into
+# place if everything goes well. (NB that this is generally not the
+# same repo as the cwd, because the objects are first received into a
+# temporary repo so they can be examined.)
+#
# if push requested FRESHREPO, push-confirm happens in said fresh repo
+# and FRESH-REPO is guaranteed not to be ''.
#
# policy hook for a particular package will be invoked only once at
# a time - (see comments about DGIT-REPOS-DIR, above)
# First, without any locking, check-list is called. It should produce
# a list of package names. Then check-package will be invoked for
# each named package, in each case after taking an appropriate lock.
+#
+# If policy hook wants to run dgit (or something else in the dgit
+# package), it should use DGIT-LIVE-DIR/dgit (etc.)
use POSIX;
our $distro;
our $suitesfile;
our $policyhook;
+our $dgitlive;
our $destrepo;
our $workrepo;
our $keyrings;
my ($policyallowbits, @polargs) = @_;
# => ($exitstatuspolicybitmap);
die if $policyallowbits & ~0x3e;
- my @cmd = ($policyhook,$distro,$dgitrepos,@polargs);
+ my @cmd = ($policyhook,$distro,$dgitrepos,$dgitlive,@polargs);
debugcmd @cmd;
my $r = system @cmd;
die "system: $!" if $r < 0;
die "hook (@cmd) failed ($?)" if $r & ~($policyallowbits << 8);
+ debug sprintf "hook (%s) => %#x", "@polargs", $r;
return $r >> 8;
}
mkrepo_fromtemplate $destrepo;
}
- policyhook(0, 'push-confirm', @policy_args);
+ my $willinstall = ($destrepo eq realdestrepo ? '' : $destrepo);
+ policyhook(0, 'push-confirm', @policy_args, $willinstall);
}
sub onwardpush () {
'repos' => \$dgitrepos,
'suites' => \$suitesfile,
'policy-hook' => \$policyhook,
+ 'dgit-live' => \$dgitlive,
);
-our @hookenvs = qw(distro suitesfile policyhook keyrings dgitrepos);
+our @hookenvs = qw(distro suitesfile policyhook dgitlive keyrings dgitrepos);
# workrepo and destrepo handled ad-hoc