mirror of
https://git.launchpad.net/~ubuntu-release/britney/+git/britney2-ubuntu
synced 2025-02-10 05:57:28 +00:00
Override unblock{,-udeb} hints based on the versions they apply to
Signed-off-by: Adam D. Barratt <adam@adam-barratt.org.uk> Based on patches to britney by Philipp Kern <pkern@debian.org>
This commit is contained in:
parent
4557c21e53
commit
5f3a747a78
11
britney.py
11
britney.py
@ -781,7 +781,16 @@ class Britney:
|
||||
z = {}
|
||||
for a, b in hints[x]:
|
||||
if z.has_key(a) and z[a] != b:
|
||||
self.__log("Overriding %s[%s] = %s with %s" % (x, a, z[a], b), type="W")
|
||||
if x in ['unblock', 'unblock-udeb']:
|
||||
if apt_pkg.VersionCompare(z[a][0], b[0]) < 0:
|
||||
# This hint is for a newer version, so discard the old one
|
||||
self.__log("Overriding %s[%s] = %s with %s" % (x, a, z[a], b), type="W")
|
||||
else:
|
||||
# This hint is for an older version, so ignore the new one
|
||||
self.__log("Ignoring %s[%s] = %s, %s is higher or equal" % (x, a, b, z[a]), type="W")
|
||||
continue
|
||||
else:
|
||||
self.__log("Overriding %s[%s] = %s with %s" % (x, a, z[a], b), type="W")
|
||||
z[a] = b
|
||||
hints[x] = z
|
||||
|
||||
|
Loading…
x
Reference in New Issue
Block a user