From: Ian Jackson <ijackson@chiark.greenend.org.uk>
Date: Mon, 11 May 2015 08:06:12 +0000 (+0100)
Subject: dgit-repos-policy-debian: Move time check (nfc, apart from debugging)
X-Git-Tag: debian/0.30~176
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=dgit.git;a=commitdiff_plain;h=70ca26cbdd84f24368897404bf2f0c6fa0589f48

dgit-repos-policy-debian: Move time check (nfc, apart from debugging)
---

diff --git a/infra/dgit-repos-policy-debian b/infra/dgit-repos-policy-debian
index b25a5601..5efccded 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);