diff options
author | Ian Jackson <ijackson@chiark.greenend.org.uk> | 2015-03-21 10:53:10 +0000 |
---|---|---|
committer | Ian Jackson <ijackson@chiark.greenend.org.uk> | 2015-03-22 15:19:27 +0000 |
commit | c00456f208d26767246b28e6f06f4462a76d9ac2 (patch) | |
tree | 8fda18864a544e05d8b07acb1aded0621af83e29 /infra/dgit-repos-server | |
parent | 850c5e51043c2eb3a9804877314edefb6156e816 (diff) |
Export policy hook exist status flags from Dgit.pm
Diffstat (limited to 'infra/dgit-repos-server')
-rwxr-xr-x | infra/dgit-repos-server | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/infra/dgit-repos-server b/infra/dgit-repos-server index 6d7fb63..3f41a0b 100755 --- a/infra/dgit-repos-server +++ b/infra/dgit-repos-server @@ -87,7 +87,7 @@ use POSIX; use Fcntl qw(:flock); use File::Path qw(rmtree); -use Debian::Dgit; +use Debian::Dgit qw(:DEFAULT :policyflags); open DEBUG, ">/dev/null" or die $!; @@ -504,7 +504,7 @@ sub checks () { debug "translated version $v"; $tagname eq "debian/$v" or die; - my ($policy) = policyhook(2,'push',$package, + my ($policy) = policyhook(NOFFCHECK, 'push',$package, $version,$suite,$tagname, join(",",@delberatelies)); @@ -512,7 +512,7 @@ sub checks () { # check that our ref is being fast-forwarded debug "oldcommit $oldcommit"; - if (!($policy & 2) && $oldcommit =~ m/[^0]/) { + if (!($policy & NOFFCHECK) && $oldcommit =~ m/[^0]/) { $?=0; $!=0; my $mb = `git merge-base $commit $oldcommit`; chomp $mb; $mb eq $oldcommit or reject "not fast forward on dgit branch"; @@ -631,8 +631,8 @@ sub parseargsdispatch () { reject "unknown method" unless $mainfunc; - my ($policy, $pollock) = policyhook(4, 'check-package',$package); - if ($policy & 4) { + my ($policy, $pollock) = policyhook(FRESHREPO,'check-package',$package); + if ($policy & FRESHREPO) { my $garbagerepo = "$dgitrepos/_tmp/${package}_garbage"; acquiretree($garbagerepo,1); rmtree $garbagerepo; |