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: Remove obsolete duplicate settings of some ENVs for stunt hook
[dgit.git]
/
infra
/
dgit-repos-policy-debian
diff --git
a/infra/dgit-repos-policy-debian
b/infra/dgit-repos-policy-debian
index 2e0bcc79af7034e9a253a3f532ad5d3003cb1bba..1e32d391129046ad2f64e5a11b6f902292a000f2 100755
(executable)
--- a/
infra/dgit-repos-policy-debian
+++ b/
infra/dgit-repos-policy-debian
@@
-20,6
+20,7
@@
enabledebuglevel $ENV{'DGIT_DRS_DEBUG'};
our $distro = shift @ARGV // die "need DISTRO";
our $repos = shift @ARGV // die "need DGIT-REPOS-DIR";
our $dgitlive = shift @ARGV // die "need DGIT-LIVE-DIR";
our $distro = shift @ARGV // die "need DISTRO";
our $repos = shift @ARGV // die "need DGIT-REPOS-DIR";
our $dgitlive = shift @ARGV // die "need DGIT-LIVE-DIR";
+our $distrodir = shift @ARGV // die "need DISTRO-DIR";
our $action = shift @ARGV // die "need ACTION";
our $publicmode = 02775;
our $action = shift @ARGV // die "need ACTION";
our $publicmode = 02775;
@@
-88,10
+89,10
@@
sub apiquery ($) {
$cmd .= " archive-api-query $subpath";
printdebug "apiquery $cmd\n";
$!=0; $?=0; my $json = `$cmd`;
$cmd .= " archive-api-query $subpath";
printdebug "apiquery $cmd\n";
$!=0; $?=0; my $json = `$cmd`;
- defined $json or die "$subpath $! $?";
+ defined $json
&& !$?
or die "$subpath $! $?";
my $r = decode_json $json;
my $d = new Data::Dumper([$r], [qw(r)]);
my $r = decode_json $json;
my $d = new Data::Dumper([$r], [qw(r)]);
- printdebug "apiquery $subpath | ", $d->Dump()
, "\n"
if $debuglevel>=2;
+ printdebug "apiquery $subpath | ", $d->Dump() if $debuglevel>=2;
return $r;
}
return $r;
}
@@
-111,10
+112,6
@@
sub specific_suite_has_vsn_in_our_history ($) {
}
sub new_has_vsn_in_our_history () {
}
sub new_has_vsn_in_our_history () {
- stat $pkgdir or die "$pkgdir $!";
- my $mtime = ((stat _)[9]);
- my $age = time - $mtime;
- return 1 if $age < $new_upload_propagation_slop;
return specific_suite_has_vsn_in_our_history('new');
}
return specific_suite_has_vsn_in_our_history('new');
}
@@
-150,21
+147,28
@@
sub getpackage () {
}
sub add_taint ($$) {
}
sub add_taint ($$) {
- my ($refobj, $reason);
+ my ($refobj, $reason) = @_;
+
+ printdebug "TAINTING $refobj\n",
+ (map { "\%| $_" } split "\n", $reason),
+ "\n";
my $tf = new File::Temp or die $!;
print $tf "$refobj^0\n" or die $!;
my $tf = new File::Temp or die $!;
print $tf "$refobj^0\n" or die $!;
+ flush $tf or die $!;
+ seek $tf,0,0 or die $!;
my $gcfpid = open GCF, "-|";
defined $gcfpid or die $!;
if (!$gcfpid) {
open STDIN, "<&", $tf or die $!;
my $gcfpid = open GCF, "-|";
defined $gcfpid or die $!;
if (!$gcfpid) {
open STDIN, "<&", $tf or die $!;
- exec 'git', 'cat-file';
+ exec 'git', 'cat-file'
, '--batch'
;
die $!;
}
close $tf or die $!;
$_ = <GCF>;
die $!;
}
close $tf or die $!;
$_ = <GCF>;
+ defined $_ or die;
m/^(\w+) (\w+) (\d+)\n/ or die "$_ ?";
my $gitobjid = $1;
my $gitobjtype = $2;
m/^(\w+) (\w+) (\d+)\n/ or die "$_ ?";
my $gitobjid = $1;
my $gitobjtype = $2;
@@
-178,7
+182,7
@@
sub add_taint ($$) {
close GCF;
$poldbh->do("INSERT INTO taints".
close GCF;
$poldbh->do("INSERT INTO taints".
- " (package, gitobjid, gitobjtype, gitobjdata, time, comment)"
,
+ " (package, gitobjid, gitobjtype, gitobjdata, time, comment)"
.
" VALUES (?,?,?,?,?,?)", {},
$pkg, $gitobjid, $gitobjtype, $gitobjdata, time, $reason);
" VALUES (?,?,?,?,?,?)", {},
$pkg, $gitobjid, $gitobjtype, $gitobjdata, time, $reason);
@@
-186,7
+190,7
@@
sub add_taint ($$) {
die unless defined $taint_id;
$poldbh->do("INSERT INTO taintoverrides".
die unless defined $taint_id;
$poldbh->do("INSERT INTO taintoverrides".
- " (taint_id, deliberately)"
,
+ " (taint_id, deliberately)"
.
" VALUES (?, 'include-questionable-history')", {},
$taint_id);
}
" VALUES (?, 'include-questionable-history')", {},
$taint_id);
}
@@
-204,14
+208,26
@@
sub action_check_package () {
return 0 unless $pkg_exists;
return 0 unless $pkg_secret;
return 0 unless $pkg_exists;
return 0 unless $pkg_secret;
+ printdebug "check_package\n";
+
chdir $pkgdir or die "$pkgdir $!";
chdir $pkgdir or die "$pkgdir $!";
- return if new_has_vsn_in_our_history();
+
+ stat '.' or die "$pkgdir $!";
+ my $mtime = ((stat _)[9]);
+ my $age = time - $mtime;
+ printdebug "check_package age=$age\n";
+
+ return 0 if $age < $new_upload_propagation_slop;
+
+ return 0 if new_has_vsn_in_our_history();
if (good_suite_has_vsn_in_our_history) {
chmod $publicmode, "." or die $!;
return 0;
}
if (good_suite_has_vsn_in_our_history) {
chmod $publicmode, "." or die $!;
return 0;
}
+ printdebug "check_package secret, deleted, tainting\n";
+
git_for_each_ref('refs/tags', sub {
my ($objid,$objtype,$fullrefname,$tagname) = @_;
add_taint_by_tag($tagname,$objid);
git_for_each_ref('refs/tags', sub {
my ($objid,$objtype,$fullrefname,$tagname) = @_;
add_taint_by_tag($tagname,$objid);
@@
-376,8
+392,12
@@
END
my $oldmode = ((stat _)[2]);
my $oldwrites = $oldmode & 0222;
# remove r and x bits which have corresponding w bits clear
my $oldmode = ((stat _)[2]);
my $oldwrites = $oldmode & 0222;
# remove r and x bits which have corresponding w bits clear
- my $newmode = $oldmode & ($oldwrites << 1) & ($oldwrites > 1);
+ my $newmode = $oldmode &
+ (~0555 | ($oldwrites << 1) | ($oldwrites >> 1));
+ printdebug sprintf "chmod %#o (was %#o) %s\n",
+ $newmode, $oldmode, $freshrepo;
chmod $newmode, $freshrepo or die $!;
chmod $newmode, $freshrepo or die $!;
+ utime undef, undef, $freshrepo or die $!;
}
}
}
}
@@
-392,7
+412,7
@@
sub action_check_list () {
statpackage();
next unless $pkg_exists;
next unless $pkg_secret;
statpackage();
next unless $pkg_exists;
next unless $pkg_secret;
- print
debug
"$pkg\n" or die $!;
+ print "$pkg\n" or die $!;
}
closedir L or die $!;
close STDOUT or die $!;
}
closedir L or die $!;
close STDOUT or die $!;