summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorIan Jackson <ijackson@chiark.greenend.org.uk>2015-05-11 09:06:12 +0100
committerIan Jackson <ijackson@chiark.greenend.org.uk>2015-05-31 11:54:11 +0100
commit70ca26cbdd84f24368897404bf2f0c6fa0589f48 (patch)
tree86be52f5d25933b9d4115d3c78de6d88146a447a
parent89dfd17c9cd0a9c030083a5530ac816987431187 (diff)
dgit-repos-policy-debian: Move time check (nfc, apart from debugging)
-rwxr-xr-xinfra/dgit-repos-policy-debian16
1 files changed, 12 insertions, 4 deletions
diff --git a/infra/dgit-repos-policy-debian b/infra/dgit-repos-policy-debian
index b25a560..5efccde 100755
--- a/infra/dgit-repos-policy-debian
+++ b/infra/dgit-repos-policy-debian
@@ -111,10 +111,6 @@ sub specific_suite_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');
}
@@ -211,7 +207,17 @@ sub action_check_package () {
return 0 unless $pkg_exists;
return 0 unless $pkg_secret;
+ printdebug "check_package\n";
+
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) {
@@ -219,6 +225,8 @@ sub action_check_package () {
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);