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-policy-debian: Move time check (nfc, apart from debugging)
[dgit.git]
/
infra
/
dgit-repos-policy-debian
diff --git
a/infra/dgit-repos-policy-debian
b/infra/dgit-repos-policy-debian
index b631d07e8169a4ef65455f41530e77b1ea5f7623..5efccded56fdcbd0123ba7f82777a7e0e9cea346 100755
(executable)
--- a/
infra/dgit-repos-policy-debian
+++ b/
infra/dgit-repos-policy-debian
@@
-88,7
+88,7
@@
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)]);
printdebug "apiquery $subpath | ", $d->Dump() if $debuglevel>=2;
my $r = decode_json $json;
my $d = new Data::Dumper([$r], [qw(r)]);
printdebug "apiquery $subpath | ", $d->Dump() if $debuglevel>=2;
@@
-111,10
+111,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
+146,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
+181,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
+189,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,7
+207,17
@@
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 $!";
+
+ stat '.' or die "$pkgdir $!";
+ my $mtime = ((stat _)[9]);
+ my $age = time - $mtime;
+ printdebug "check_package age=$age\n";
+
+ return 1 if $age < $new_upload_propagation_slop;
+
return if new_has_vsn_in_our_history();
if (good_suite_has_vsn_in_our_history) {
return if new_has_vsn_in_our_history();
if (good_suite_has_vsn_in_our_history) {
@@
-212,6
+225,8
@@
sub action_check_package () {
return 0;
}
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);