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

Merge and re-factor some pu and tpu tests

Browse Source 
Signed-off-by: Adam D. Barratt <adam@adam-barratt.org.uk>
This commit is contained in:
Adam D. Barratt 2011-07-27 09:38:27 +00:00
parent b3d9254492
commit 6abb29a8e6
1 changed files with 10 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
britney.py
View File

@ -2031,9 +2031,7 @@ class Britney:
# arch = "<source>/<arch>", # arch = "<source>/<arch>",
elif "/" in pkg: elif "/" in pkg:
pkg_name, arch = pkg.split("/") pkg_name, arch = pkg.split("/")
if arch.endswith("_tpu"): if arch.endswith("_tpu") or arch.endswith("_pu"):
arch, suite = arch.split("_")
elif arch.endswith("_pu"):
arch, suite = arch.split("_") arch, suite = arch.split("_")
else: suite = "unstable" else: suite = "unstable"
# removal of source packages = "-<source>", # removal of source packages = "-<source>",
@ -2041,13 +2039,9 @@ class Britney:
pkg_name = pkg[1:] pkg_name = pkg[1:]
suite = "testing" suite = "testing"
# testing-proposed-updates = "<source>_tpu" # testing-proposed-updates = "<source>_tpu"
# XXXX: why don't these just use split("_") ? # proposed-updates = "<source>_pu"
elif pkg.endswith("_tpu"): elif pkg.endswith("_tpu") or pkg.endswith("_pu"):
pkg_name = pkg[:-4] pkg_name, suite = pkg.rsplit("_")
suite = "tpu"
elif pkg.endswith("_pu"):
pkg_name = pkg[:-3]
suite = "pu"
# normal update of source packages = "<source>" # normal update of source packages = "<source>"
else: else:
pkg_name = pkg pkg_name = pkg
@ -2741,19 +2735,12 @@ class Britney:
# skip removal requests # skip removal requests
if pkg[0] == "-": if pkg[0] == "-":
continue continue
# handle testing-proposed-updates # handle *-proposed-updates
elif pkg.endswith("_tpu"): elif pkg.endswith("_tpu") or pkg.endswith("_pu"):
pkg = pkg[:-4] pkg, suite = pkg.rsplit("_")
if pkg not in self.sources['tpu']: continue if pkg not in self.sources[suite]: continue
if apt_pkg.VersionCompare(self.sources['tpu'][pkg][VERSION], v) != 0: if apt_pkg.VersionCompare(self.sources[suite][pkg][VERSION], v) != 0:
self.output_write(" Version mismatch, %s %s != %s\n" % (pkg, v, self.sources['tpu'][pkg][VERSION])) self.output_write(" Version mismatch, %s %s != %s\n" % (pkg, v, self.sources[suite][pkg][VERSION]))
ok = False
# handle proposed-updates
elif pkg.endswith("_pu"):
pkg = pkg[:-3]
if pkg not in self.sources['pu']: continue
if apt_pkg.VersionCompare(self.sources['pu'][pkg][VERSION], v) != 0:
self.output_write(" Version mismatch, %s %s != %s\n" % (pkg, v, self.sources['pu'][pkg][VERSION]))
ok = False ok = False
# does the package exist in unstable? # does the package exist in unstable?
elif pkg not in self.sources['unstable']: elif pkg not in self.sources['unstable']: