Lubuntu/britney2-ubuntu
8
0
Fork 0
mirror of https://git.launchpad.net/~ubuntu-release/britney/+git/britney2-ubuntu synced 2025-05-13 19:41:29 +00:00
Code Issues Packages Projects Releases Wiki Activity

Simplify hint override checking

Browse Source 
Signed-off-by: Adam D. Barratt <adam@adam-barratt.org.uk>
This commit is contained in:
Adam D. Barratt 2011-11-14 19:52:42 +00:00
parent 9f793fcbec
commit 0fbecb9a9e
1 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
britney.py
View File

@ -804,27 +804,27 @@ class Britney:
z = {} z = {}
for hint in hints[x]: for hint in hints[x]:
package = hint.package package = hint.package
if z.has_key(package) and z[package] != hint: key = (hint, hint.user)
if z.has_key(package) and z[package] != key:
hint2 = z[package][0]
if x in ['unblock', 'unblock-udeb']: if x in ['unblock', 'unblock-udeb']:
if apt_pkg.VersionCompare(z[package].version, hint.version) < 0: if apt_pkg.VersionCompare(hint2.version, hint.version) < 0:
# This hint is for a newer version, so discard the old one # This hint is for a newer version, so discard the old one
self.__log("Overriding %s[%s] = ('%s', '%s') with ('%s', '%s')" % self.__log("Overriding %s[%s] = ('%s', '%s') with ('%s', '%s')" %
(x, package, z[package].version, z[package].user, hint.version, hint.user), type="W") (x, package, hint2.version, hint2.user, hint.version, hint.user), type="W")
for other in [y for y in hints[x] if y.package==package and y.version==z[package]]: hint2.set_active(False)
other.set_active(False)
else: else:
# This hint is for an older version, so ignore it in favour of the new one # This hint is for an older version, so ignore it in favour of the new one
self.__log("Ignoring %s[%s] = ('%s', '%s'), ('%s', '%s') is higher or equal" % self.__log("Ignoring %s[%s] = ('%s', '%s'), ('%s', '%s') is higher or equal" %
(x, package, hint.version, hint.user, z[package].version, z[package].user), type="W") (x, package, hint.version, hint.user, hint2.version, hint2.user), type="W")
hint.set_active(False) hint.set_active(False)
else: else:
self.__log("Overriding %s[%s] = ('%s', '%s', '%s') with ('%s, '%s, '%s')" % self.__log("Overriding %s[%s] = ('%s', '%s', '%s') with ('%s', '%s', '%s')" %
(x, package, z[package].version, z[package].user, z[package].days, (x, package, hint2.version, hint2.user, hint2.days,
hint.version, hint.user, hint.days), type="W") hint.version, hint.user, hint.days), type="W")
for other in [y for y in hints[x] if y.package==package and y.version==z[package].version]: hint2.set_active(False)
other.set_active(False)
z[package] = hint z[package] = key
# Sanity check the hints hash # Sanity check the hints hash
if len(hints["block"]) == 0 and len(hints["block-udeb"]) == 0: if len(hints["block"]) == 0 and len(hints["block-udeb"]) == 0: