From 0a1c524cdd52435f931efdb078554a3bc1bf0eae Mon Sep 17 00:00:00 2001 From: Ian Jackson Date: Tue, 21 Jul 2015 18:47:54 +0100 Subject: [PATCH] Infrastructure: Get mirroring right for fresh repos of existing packages (!) --- debian/changelog | 2 ++ infra/dgit-repos-policy-debian | 7 ++++++- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index debc0d64..1d11dcae 100644 --- a/debian/changelog +++ b/debian/changelog @@ -21,6 +21,8 @@ dgit (1.1) unstable; urgency=low * Manpage: Clarify wording of readonly config. * Manpage: Better cross-references for -k and keyid. * dgit(7): No longer say that dgit-repos lives on Alioth. + * Infrastructure: Get mirroring right for fresh repos of existing + packages (!) -- diff --git a/infra/dgit-repos-policy-debian b/infra/dgit-repos-policy-debian index f20572d6..b6310d95 100755 --- a/infra/dgit-repos-policy-debian +++ b/infra/dgit-repos-policy-debian @@ -67,6 +67,11 @@ our %deliberately; # [1] looking for the relevant git tag for the version number and not # caring what that tag refers to. # +# When we are doing a push to a fresh repo, any version will do: in +# this case, this is the first dgit upload of an existing package, +# and we trust that the uploader hasn't included in their git +# history any previous non-dgit uploads. +# # A wrinkle: if we approved a push recently, we treat NEW as having # a version which is in our history. This is because the package may # still be being uploaded. (We record this using the timestamp of the @@ -420,7 +425,7 @@ END } if (length $freshrepo) { - if (!good_suite_has_suitable_vsn(\&vsn_in_our_history)) { + if (!good_suite_has_suitable_vsn(sub { 1; })) { stat $freshrepo or die "$freshrepo $!"; my $oldmode = ((stat _)[2]); my $oldwrites = $oldmode & 0222; -- 2.30.2