Lubuntu/britney2-ubuntu
8
0
Fork 0
mirror of https://git.launchpad.net/~ubuntu-release/britney/+git/britney2-ubuntu synced 2025-02-13 15:37:02 +00:00
Code Issues Packages Projects Releases Wiki Activity

merge trunk up to 2013-03-16

Browse Source
This commit is contained in:
Colin Watson 2013-09-24 14:02:26 +01:00
commit c8bfb275ee
3 changed files with 74 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

73
britney.py
View File

@ -1344,17 +1344,20 @@ class Britney(object):
if not anywrongver and (anyworthdoing or not self.sources[suite][src][FAKESRC]):
srcv = self.sources[suite][src][VERSION]
ssrc = self.same_source(source_t[VERSION], srcv)
# for every binary package produced by this source in testing for this architecture
for pkg in sorted([x.split("/")[0] for x in self.sources['testing'][src][BINARIES] if x.endswith("/"+arch)]):
# if the package is architecture-independent, then ignore it
if self.binaries['testing'][arch][0][pkg][ARCHITECTURE] == 'all':
excuse.addhtml("Ignoring removal of %s as it is arch: all" % (pkg))
continue
# if the package is not produced by the new source package, then remove it from testing
if pkg not in self.binaries[suite][arch][0]:
tpkgv = self.binaries['testing'][arch][0][pkg][VERSION]
excuse.addhtml("Removed binary: %s %s" % (pkg, tpkgv))
if ssrc: anyworthdoing = True
# if this is a binary-only migration via *pu, we never want to try
# removing binary packages
if not (ssrc and suite != 'unstable'):
# for every binary package produced by this source in testing for this architecture
for pkg in sorted([x.split("/")[0] for x in self.sources['testing'][src][BINARIES] if x.endswith("/"+arch)]):
# if the package is architecture-independent, then ignore it
if self.binaries['testing'][arch][0][pkg][ARCHITECTURE] == 'all':
excuse.addhtml("Ignoring removal of %s as it is arch: all" % (pkg))
continue
# if the package is not produced by the new source package, then remove it from testing
if pkg not in self.binaries[suite][arch][0]:
tpkgv = self.binaries['testing'][arch][0][pkg][VERSION]
excuse.addhtml("Removed binary: %s %s" % (pkg, tpkgv))
if ssrc: anyworthdoing = True
# if there is nothing wrong and there is something worth doing, this is a valid candidate
if not anywrongver and anyworthdoing:
@ -1502,15 +1505,22 @@ class Britney(object):
if suite in ['pu', 'tpu']:
# o-o-d(ish) checks for (t-)p-u
for arch in self.options.architectures:
# If the package isn't in testing or the testing
# package produces no packages on this architecture,
# then it can't be out-of-date. We assume that if
# the (t-)p-u package has produced any binaries for
# this architecture then it is ok
if not src in self.sources["testing"] or \
(len([x for x in self.sources["testing"][src][BINARIES] if x.endswith("/"+arch) and self.binaries["testing"][arch][0][x.split("/")[0]][ARCHITECTURE] != 'all' ]) == 0) or \
(len([x for x in self.sources[suite][src][BINARIES] if x.endswith("/"+arch) and self.binaries[suite][arch][0][x.split("/")[0]][ARCHITECTURE] != 'all' ]) > 0):
if src not in self.sources["testing"]:
continue
# if the package in testing has no binaries on this
# architecture, it can't be out-of-date
if not any(x for x in self.sources["testing"][src][BINARIES]
if x.endswith("/"+arch) and self.binaries["testing"][arch][0][x.split("/")[0]][ARCHITECTURE] != 'all'):
continue
# if the (t-)p-u package has produced any binaries on
# this architecture then we assume it's ok. this allows for
# uploads to (t-)p-u which intentionally drop binary
# packages
if any(x for x in self.binaries[suite][arch][0].values() \
if x[SOURCE] == src and x[SOURCEVER] == source_u[VERSION] and \
x[ARCHITECTURE] != 'all'):
continue
if suite == 'tpu':
@ -1724,6 +1734,8 @@ class Britney(object):
# if a package is going to be removed, it will have a "-" prefix
upgrade_me = []
self.excuses = []
# for every source package in testing, check if it should be removed
for pkg in sources['testing']:
if should_remove_source(pkg):
@ -2063,7 +2075,16 @@ class Britney(object):
# first, build a list of eligible binaries
for p in source[BINARIES]:
binary, parch = p.split("/")
if item.architecture != 'source' and parch != item.architecture: continue
if item.architecture != 'source':
# for a binary migration, binaries should not be removed:
# - unless they are for the correct architecture
if parch != item.architecture: continue
# - if they are arch:all and the migration is via *pu,
# as the packages will not have been rebuilt and the
# source suite will not contain them
if binaries[parch][0][binary][ARCHITECTURE] == 'all' and \
item.suite != 'unstable':
continue
# do not remove binaries which have been hijacked by other sources
if binaries[parch][0][binary][SOURCE] != item.package: continue
bins.append(p)
@ -2108,9 +2129,8 @@ class Britney(object):
# outside of the current source
for p in check:
binary, parch = p.split("/")
rdeps = [ bin for bin in binaries[parch][0][binary][RDEPENDS] \
if bin in [y.split("/")[0] for y in smoothbins] ]
if len(rdeps) > 0:
if any(bin for bin in binaries[parch][0][binary][RDEPENDS] \
if bin in [y.split("/")[0] for y in smoothbins]):
smoothbins.append(p)
# remove all the binaries which aren't being smooth updated
@ -2752,6 +2772,11 @@ class Britney(object):
# quit the hint tester
if input and input[0] in ('quit', 'exit'):
break
elif input and input[0] in ('remove', 'approve', 'urgent', 'age-days',
'block', 'block-udeb', 'unblock', 'unblock-udeb',
'block-all', 'force'):
self.hints.add_hint(' '.join(input), 'hint-tester')
self.write_excuses()
# run a hint
elif input and input[0] in ('easy', 'hint', 'force-hint'):
try:

1
britney_nobreakall.conf
View File

@ -47,6 +47,7 @@ HINTS_JCRISTAU = STANDARD force force-hint
HINTS_FAW = HELPERS
HINTS_NTHYKIER = STANDARD
HINTS_KIBI = STANDARD
HINTS_JMW = STANDARD
HINTS_FREEZE = block block-all block-udeb
HINTS_FREEZE-EXCEPTION = unblock unblock-udeb
HINTS_SATBRITNEY = easy

30
completer.py
View File

@ -1,6 +1,7 @@
# -*- coding: utf-8 -*-
# Copyright (C) 2011 Niels Thykier <niels@thykier.net>
# Copyright (C) 2013 Adam D. Barratt <adam@adam-barratt.org.uk>
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
@ -28,11 +29,15 @@ class Completer(object):
Creates a completer for a given britney.
"""
self.matches = []
self.cmds = ['easy', 'hint', 'force-hint', 'exit', 'quit']
self.cmds = ['easy', 'hint', 'force-hint', 'force', 'remove',
'force', 'age-days', 'urgent', 'block-all',
'block', 'block-udeb', 'unblock', 'unblock-udeb',
'approve', 'exit', 'quit']
self.britney = britney
# generate a completion list from excuses.
# - it might contain too many items, but meh
complete = []
tpu = []
for e in britney.excuses:
ver = None
pkg = e.name
@ -40,12 +45,19 @@ class Completer(object):
if pkg[0] == '-':
suite = 'testing'
pkg = pkg[1:]
if "_" in pkg:
(pkg, suite) = pkg.split("_")
if "/" in pkg:
pkg = pkg.split("/")[0]
name = "%s/%s" % (e.name, britney.sources[suite][pkg][0]) # 0 == VERSION
complete.append(name)
if suite == 'tpu':
tpu.append(name)
self.packages = sorted(complete)
self.tpu_packages = sorted(tpu)
testing = britney.sources['testing']
self.testing_packages = sorted("%s/%s" % (pkg, testing[pkg][0]) for pkg in testing)
def completer(self, text, state):
"""readline completer (see the readline API)"""
@ -59,11 +71,17 @@ class Completer(object):
self.matches = [x for x in self.cmds if x.startswith(text)]
else:
# complete pkg/[arch/]version
start = bisect.bisect_left(self.packages, text)
while start < len(self.packages):
if not self.packages[start].startswith(text):
if words[0] == 'remove':
packages = self.testing_packages
elif words[0] == 'approve':
packages = self.tpu_packages
else:
packages = self.packages
start = bisect.bisect_left(packages, text)
while start < len(packages):
if not packages[start].startswith(text):
break
self.matches.append(self.packages[start])
self.matches.append(packages[start])
start += 1
if len(self.matches) > state: