From: Joerg Jaspert Date: Sat, 29 Nov 2008 23:54:27 +0000 (+0100) Subject: Make cross_suite_version_checks functional. X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=7a45106601c9a030fc839d72a19c2f02fe125583;p=dak Make cross_suite_version_checks functional. OLD bug. Signed-off-by: Joerg Jaspert --- diff --git a/ChangeLog b/ChangeLog index 927b4164..051bd1d9 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +2008-11-30 Joerg Jaspert + + * dak/daklib/queue.py (Upload.cross_suite_version_check): Add a + few () to make cross_suite_version_check finally work as + intended (well, we hope). Thanks to Philipp Kern for spotting this. + 2008-11-28 Mark Hymers * dak/new_security_install.py: Don't attempt to delete the .changes files diff --git a/daklib/queue.py b/daklib/queue.py index 813782e2..69803346 100755 --- a/daklib/queue.py +++ b/daklib/queue.py @@ -855,8 +855,8 @@ distribution.""" # Check versions for each target suite for target_suite in self.pkg.changes["distribution"].keys(): - must_be_newer_than = [ i.lower for i in self.Cnf.ValueList("Suite::%s::VersionChecks::MustBeNewerThan" % (target_suite)) ] - must_be_older_than = [ i.lower for i in self.Cnf.ValueList("Suite::%s::VersionChecks::MustBeOlderThan" % (target_suite)) ] + must_be_newer_than = [ i.lower() for i in self.Cnf.ValueList("Suite::%s::VersionChecks::MustBeNewerThan" % (target_suite)) ] + must_be_older_than = [ i.lower() for i in self.Cnf.ValueList("Suite::%s::VersionChecks::MustBeOlderThan" % (target_suite)) ] # Enforce "must be newer than target suite" even if conffile omits it if target_suite not in must_be_newer_than: must_be_newer_than.append(target_suite)