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

This should fix the diffs, armel is a BREAK_ARCH.

Browse Source
This commit is contained in:
Fabio Tranchitella 2008-02-28 17:23:37 +00:00
parent 52ad4f0e26
commit 469d67fca2
2 changed files with 14 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
britney.conf
View File

@ -12,7 +12,7 @@ UPGRADE_OUTPUT = /srv/ftp.debian.org/testing/output/output.txt
HEIDI_OUTPUT = /srv/ftp.debian.org/testing/output/HeidiResult HEIDI_OUTPUT = /srv/ftp.debian.org/testing/output/HeidiResult
# List of release architectures # List of release architectures
ARCHITECTURES = i386 sparc alpha powerpc arm hppa ia64 mips mipsel s390 amd64 ARCHITECTURES = i386 sparc alpha powerpc arm hppa ia64 mips mipsel s390 amd64 armel
# if you're not in this list, arch: all packages are allowed to break on you # if you're not in this list, arch: all packages are allowed to break on you
NOBREAKALL_ARCHES = i386 NOBREAKALL_ARCHES = i386
@ -21,7 +21,7 @@ NOBREAKALL_ARCHES = i386
FUCKED_ARCHES = FUCKED_ARCHES =
# if you're in this list, your uninstallability count may increase # if you're in this list, your uninstallability count may increase
BREAK_ARCHES = BREAK_ARCHES = armel
# if you're in this list, you are a new architecture # if you're in this list, you are a new architecture
NEW_ARCHES = NEW_ARCHES =

24
britney.py
View File

@ -875,7 +875,7 @@ class Britney:
if ":" not in r: continue if ":" not in r: continue
arch, packages = r.strip().split(":", 1) arch, packages = r.strip().split(":", 1)
if arch.split("+", 1)[0] in self.options.architectures: if arch.split("+", 1)[0] in self.options.architectures:
nuninst[arch] = packages.split() nuninst[arch] = set(packages.split())
return nuninst return nuninst
@ -1570,14 +1570,14 @@ class Britney:
# check all the packages for this architecture, calling add_nuninst if a new # check all the packages for this architecture, calling add_nuninst if a new
# uninstallable package is found # uninstallable package is found
nuninst[arch] = [] nuninst[arch] = set()
for pkg_name in binaries[arch][0]: for pkg_name in binaries[arch][0]:
r = systems[arch].is_installable(pkg_name) r = systems[arch].is_installable(pkg_name)
if not r: if not r:
nuninst[arch].append(pkg_name) nuninst[arch].add(pkg_name)
# if they are not required, removed architecture-indipendent packages # if they are not required, removed architecture-indipendent packages
nuninst[arch + "+all"] = nuninst[arch][:] nuninst[arch + "+all"] = nuninst[arch].copy()
if skip_archall: if skip_archall:
for pkg in nuninst[arch + "+all"]: for pkg in nuninst[arch + "+all"]:
bpkg = binaries[arch][0][pkg] bpkg = binaries[arch][0][pkg]
@ -2153,8 +2153,8 @@ class Britney:
skip_archall = True skip_archall = True
else: skip_archall = False else: skip_archall = False
nuninst[arch] = [x for x in nuninst_comp[arch] if x in binaries[arch][0]] nuninst[arch] = set([x for x in nuninst_comp[arch] if x in binaries[arch][0]])
nuninst[arch + "+all"] = [x for x in nuninst_comp[arch + "+all"] if x in binaries[arch][0]] nuninst[arch + "+all"] = set([x for x in nuninst_comp[arch + "+all"] if x in binaries[arch][0]])
broken = nuninst[arch + "+all"] broken = nuninst[arch + "+all"]
to_check = [] to_check = []
@ -2164,9 +2164,9 @@ class Britney:
r = systems[arch].is_installable(p) r = systems[arch].is_installable(p)
if not r and p not in broken: if not r and p not in broken:
to_check.append(p) to_check.append(p)
broken.append(p) broken.add(p)
if not (skip_archall and binaries[arch][0][p][ARCHITECTURE] == 'all'): if not (skip_archall and binaries[arch][0][p][ARCHITECTURE] == 'all'):
nuninst[arch].append(p) nuninst[arch].add(p)
elif r and p in broken: elif r and p in broken:
to_check.append(p) to_check.append(p)
broken.remove(p) broken.remove(p)
@ -2181,10 +2181,10 @@ class Britney:
if p in broken or p not in binaries[arch][0]: continue if p in broken or p not in binaries[arch][0]: continue
r = systems[arch].is_installable(p) r = systems[arch].is_installable(p)
if not r and p not in broken: if not r and p not in broken:
broken.append(p) broken.add(p)
to_check.append(p) to_check.append(p)
if not (skip_archall and binaries[arch][0][p][ARCHITECTURE] == 'all'): if not (skip_archall and binaries[arch][0][p][ARCHITECTURE] == 'all'):
nuninst[arch].append(p) nuninst[arch].add(p)
elif r and p in nuninst[arch + "+all"]: elif r and p in nuninst[arch + "+all"]:
broken.remove(p) broken.remove(p)
to_check.append(p) to_check.append(p)
@ -2510,10 +2510,10 @@ class Britney:
print "" print ""
break break
# quit the hint tester # quit the hint tester
if input[0] in ('quit', 'exit'): if input and input[0] in ('quit', 'exit'):
break break
# run a hint # run a hint
elif input[0] in ('easy', 'hint', 'force-hint'): elif input and input[0] in ('easy', 'hint', 'force-hint'):
self.do_hint(input[0], 'hint-tester', self.do_hint(input[0], 'hint-tester',
[k.rsplit("/", 1) for k in input[1:] if "/" in k]) [k.rsplit("/", 1) for k in input[1:] if "/" in k])