mirror of
https://git.launchpad.net/~ubuntu-release/britney/+git/britney2-ubuntu
synced 2025-04-14 04:31:09 +00:00
At this point, we could schedule a periodic diff between the original excuses and the new ones; everything seems to be the same (excluding the usual bugs in the
old implementation).
This commit is contained in:
parent
7fb9f58bb8
commit
20621c1a27
2
BUGS
2
BUGS
@ -1,4 +1,4 @@
|
||||
# list of bugs for old britney
|
||||
# * if there are no tpu approvals, then all the packages are approved
|
||||
# * while building the upgrade excuses, dependencies on virtual packages can be versioned, but not on UpgradeRun
|
||||
# * if a binary package is found in testing-proposed-updates, but its sources doesn't exist, it is considered and requires approval from RM
|
||||
# * if a binary package is found in testing-proposed-updates, but its source doesn't exist, it is considered and requires approval from RM
|
||||
|
41
britney.py
41
britney.py
@ -590,6 +590,14 @@ class Britney:
|
||||
elif pkg not in self.bugs['unstable']:
|
||||
self.bugs['unstable'][pkg] = []
|
||||
|
||||
# retrieve the maximum version of the package in testing:
|
||||
maxvert = self.__maxver(pkg, 'testing')
|
||||
|
||||
# if the package is not available in testing, then reset
|
||||
# the list of RC bugs
|
||||
if maxvert == None:
|
||||
self.bugs['testing'][pkg] = []
|
||||
|
||||
def read_dates(self, basedir):
|
||||
"""Read the upload date for the packages from the specified directory
|
||||
|
||||
@ -875,11 +883,6 @@ class Britney:
|
||||
"""
|
||||
if sv1 == sv2:
|
||||
return 1
|
||||
else:
|
||||
# XXX: don't know why this method is lobotomized... we should check
|
||||
# later the reason, and if it still applies we should remove the
|
||||
# following code
|
||||
return 0
|
||||
|
||||
m = re.match(r'^(.*)\+b\d+$', sv1)
|
||||
if m: sv1 = m.group(1)
|
||||
@ -889,26 +892,7 @@ class Britney:
|
||||
if sv1 == sv2:
|
||||
return 1
|
||||
|
||||
if re.search("-", sv1) or re.search("-", sv2):
|
||||
m = re.match(r'^(.*-[^.]+)\.0\.\d+$', sv1)
|
||||
if m: sv1 = m.group(1)
|
||||
m = re.match(r'^(.*-[^.]+\.[^.]+)\.\d+$', sv1)
|
||||
if m: sv1 = m.group(1)
|
||||
|
||||
m = re.match(r'^(.*-[^.]+)\.0\.\d+$', sv2)
|
||||
if m: sv2 = m.group(1)
|
||||
m = re.match(r'^(.*-[^.]+\.[^.]+)\.\d+$', sv2)
|
||||
if m: sv2 = m.group(1)
|
||||
|
||||
return (sv1 == sv2)
|
||||
else:
|
||||
m = re.match(r'^([^-]+)\.0\.\d+$', sv1)
|
||||
if m and sv2 == m.group(1): return 1
|
||||
|
||||
m = re.match(r'^([^-]+)\.0\.\d+$', sv2)
|
||||
if m and sv1 == m.group(1): return 1
|
||||
|
||||
return 0
|
||||
return 0
|
||||
|
||||
def get_dependency_solvers(self, block, arch, distribution, excluded=[], strict=False):
|
||||
"""Find the packages which satisfy a dependency block
|
||||
@ -1227,12 +1211,11 @@ class Britney:
|
||||
# is processed only if the specified version is correct
|
||||
if blocked:
|
||||
unblock = self.hints["unblock"].get(src,(None,None))
|
||||
if unblock[0] != None:
|
||||
if self.same_source(unblock[0], source_u[VERSION]):
|
||||
if unblock[0] != None and self.same_source(unblock[0], source_u[VERSION]):
|
||||
excuse.addhtml("Ignoring request to block package by %s, due to unblock request by %s" % (blocked, unblock[1]))
|
||||
else:
|
||||
excuse.addhtml("Unblock request by %s ignored due to version mismatch: %s" % (unblock[1], unblock[0]))
|
||||
else:
|
||||
if unblock[0] != None:
|
||||
excuse.addhtml("Unblock request by %s ignored due to version mismatch: %s" % (unblock[1], unblock[0]))
|
||||
excuse.addhtml("Not touching package, as requested by %s (contact debian-release if update is needed)" % (blocked))
|
||||
update_candidate = False
|
||||
|
||||
|
Loading…
x
Reference in New Issue
Block a user