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

Fix-up hint override logic

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:15:25 +00:00
parent a2ba758279
commit 9f793fcbec
1 changed files with 11 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
britney.py
View File

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