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

Revert some changes against Debian that are no longer needed now that we have upload dates.

Browse Source
This commit is contained in:
Colin Watson 2013-09-25 15:00:17 +01:00
parent 4947186643
commit eebdf0fffd
1 changed files with 9 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
britney.py
View File

@ -737,18 +737,13 @@ class Britney(object):
dates = {} dates = {}
filename = os.path.join(basedir, "Dates") filename = os.path.join(basedir, "Dates")
self.__log("Loading upload data from %s" % filename) self.__log("Loading upload data from %s" % filename)
try:
for line in open(filename): for line in open(filename):
l = line.split() l = line.split()
if len(l) != 3: continue if len(l) != 3: continue
try: try:
dates[l[0]] = (l[1], int(l[2])) dates[l[0]] = (l[1], int(l[2]))
except ValueError: except ValueError:
self.__log("Dates, unable to parse \"%s\"" % line, self.__log("Dates, unable to parse \"%s\"" % line, type="E")
type="E")
except IOError:
self.__log("%s missing; skipping date-based processing" % filename)
return None
return dates return dates
def write_dates(self, basedir, dates): def write_dates(self, basedir, dates):
@ -1361,7 +1356,7 @@ class Britney(object):
# permanence in unstable before updating testing; if the source package is too young, # permanence in unstable before updating testing; if the source package is too young,
# the check fails and we set update_candidate to False to block the update; consider # the check fails and we set update_candidate to False to block the update; consider
# the age-days hint, if specified for the package # the age-days hint, if specified for the package
if suite == 'unstable' and self.dates is not None: if suite == 'unstable':
if src not in self.dates: if src not in self.dates:
self.dates[src] = (source_u[VERSION], self.date_now) self.dates[src] = (source_u[VERSION], self.date_now)
elif not same_source(self.dates[src][0], source_u[VERSION]): elif not same_source(self.dates[src][0], source_u[VERSION]):
@ -2514,7 +2509,6 @@ class Britney(object):
self.write_controlfiles(self.options.testing, 'testing') self.write_controlfiles(self.options.testing, 'testing')
# write dates # write dates
if self.dates is not None:
self.write_dates(self.options.testing, self.dates) self.write_dates(self.options.testing, self.dates)
# write HeidiResult # write HeidiResult