Support for single-architecture updates.

bzr-import-20160707
Fabio Tranchitella 19 years ago
parent db59ded380
commit e3b6b42181

@ -1287,13 +1287,13 @@ class Britney:
return nuninst return nuninst
def eval_nuninst(self, nuninst): def eval_nuninst(self, nuninst, original=None):
res = [] res = []
total = 0 total = 0
totalbreak = 0 totalbreak = 0
for arch in self.options.architectures: for arch in self.options.architectures:
if nuninst.has_key(arch): if nuninst.has_key(arch):
n = len(nuninst[arch]) n = len(nuninst[arch]) + (original and len(original[arch]) or 0)
if arch in self.options.break_arches: if arch in self.options.break_arches:
totalbreak = totalbreak + n totalbreak = totalbreak + n
else: else:
@ -1314,26 +1314,27 @@ class Britney:
undo = {'binaries': {}, 'sources': {}} undo = {'binaries': {}, 'sources': {}}
affected = [] affected = []
arch = None
# arch = "<source>/<arch>", # arch = "<source>/<arch>",
if "/" in pkg: if "/" in pkg:
print "NOT HANDLED!" pkg_name, arch = pkg.split("/")
sys.exit(1) suite = "unstable"
# removals = "-<source>", # removals = "-<source>",
# normal = "<source>" elif pkg[0] == "-":
else:
if pkg[0] == "-":
pkg_name = pkg[1:] pkg_name = pkg[1:]
suite = "testing" suite = "testing"
# testing-proposed-updates = "<source>_tpu"
elif pkg[0].endswith("_tpu"): elif pkg[0].endswith("_tpu"):
pkg_name = pkg[:-4] pkg_name = pkg[:-4]
suite = "tpu" suite = "tpu"
# normal = "<source>"
else: else:
pkg_name = pkg pkg_name = pkg
suite = "unstable" suite = "unstable"
# remove all binary packages (if the source already exists) # remove all binary packages (if the source already exists)
if not arch:
if pkg_name in self.sources['testing']: if pkg_name in self.sources['testing']:
source = self.sources['testing'][pkg_name] source = self.sources['testing'][pkg_name]
for p in source['binaries']: for p in source['binaries']:
@ -1344,6 +1345,12 @@ class Britney:
del self.binaries['testing'][arch][0][binary] del self.binaries['testing'][arch][0][binary]
undo['sources'][pkg_name] = source undo['sources'][pkg_name] = source
del self.sources['testing'][pkg_name] del self.sources['testing'][pkg_name]
# single architecture update (eg. binNMU)
else:
if self.binaries['testing'][arch][0].has_key(pkg_name):
for j in self.binaries['testing'][arch][0][pkg_name]['rdepends']:
if j not in affected: affected.append((j[0], j[1], j[2], arch))
source = {'binaries': [pkg]}
# add the new binary packages (if we are not removing) # add the new binary packages (if we are not removing)
if pkg[0] != "-": if pkg[0] != "-":
@ -1420,7 +1427,7 @@ class Britney:
nuninst_comp = nuninst_new nuninst_comp = nuninst_new
else: else:
output.write("skipped: %s (%d <- %d)\n" % (pkg, len(extra), len(packages))) output.write("skipped: %s (%d <- %d)\n" % (pkg, len(extra), len(packages)))
output.write(" got: %s\n" % self.eval_nuninst(nuninst)) output.write(" got: %s\n" % self.eval_nuninst(nuninst, self.nuninst_orig))
output.write(" * %s: %s\n" % (arch, ", ".join(nuninst[arch]))) output.write(" * %s: %s\n" % (arch, ", ".join(nuninst[arch])))
extra.append(pkg) extra.append(pkg)

Loading…
Cancel
Save