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

Add MigrationItem to Excuse

Browse Source
This commit is contained in:
Ivo De Decker 2020-01-14 22:18:25 +00:00
parent ef2cae9be5
commit 055f0f07e5
2 changed files with 21 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
britney2/excuse.py
View File

@ -139,13 +139,13 @@ class Excuse(object):
# Regular expression for removing the email address # Regular expression for removing the email address
reemail = re.compile(r" *<.*?>") reemail = re.compile(r" *<.*?>")
def __init__(self, name): def __init__(self, migrationitem):
"""Class constructor """Class constructor
This method initializes the excuse with the specified name and This method initializes the excuse with the specified name and
the default values. the default values.
""" """
self.name = name self.item = migrationitem
self.ver = ("-", "-") self.ver = ("-", "-")
self.maint = None self.maint = None
self.daysold = None self.daysold = None
@ -191,6 +191,10 @@ class Excuse(object):
return (-1, self.name) return (-1, self.name)
return (self.daysold, self.name) return (self.daysold, self.name)
@property
def name(self):
return self.item.name
@property @property
def is_valid(self): def is_valid(self):
return False if self._policy_verdict.is_rejected else True return False if self._policy_verdict.is_rejected else True

28
britney2/excusefinder.py
View File

@ -6,6 +6,7 @@ import apt_pkg
from britney2 import DependencyType, PackageId from britney2 import DependencyType, PackageId
from britney2.excuse import Excuse from britney2.excuse import Excuse
from britney2.excusedeps import DependencySpec from britney2.excusedeps import DependencySpec
from britney2.migrationitem import MigrationItem
from britney2.policies import PolicyVerdict from britney2.policies import PolicyVerdict
from britney2.utils import (invalidate_excuses, find_smooth_updateable_binaries, from britney2.utils import (invalidate_excuses, find_smooth_updateable_binaries,
get_dependency_solvers, get_dependency_solvers,
@ -44,7 +45,7 @@ class ExcuseFinder(object):
return False return False
# otherwise, add a new excuse for its removal # otherwise, add a new excuse for its removal
src = item.suite.sources[pkg] src = item.suite.sources[pkg]
excuse = Excuse(item.name) excuse = Excuse(item)
excuse.addinfo("Package not in %s, will try to remove" % source_suite.name) excuse.addinfo("Package not in %s, will try to remove" % source_suite.name)
excuse.set_vers(src.version, None) excuse.set_vers(src.version, None)
src.maintainer and excuse.set_maint(src.maintainer) src.maintainer and excuse.set_maint(src.maintainer)
@ -85,7 +86,7 @@ class ExcuseFinder(object):
source_t = target_suite.sources[src] source_t = target_suite.sources[src]
source_u = source_suite.sources[src] source_u = source_suite.sources[src]
excuse = Excuse(item.name) excuse = Excuse(item)
excuse.set_vers(source_t.version, source_t.version) excuse.set_vers(source_t.version, source_t.version)
source_u.maintainer and excuse.set_maint(source_u.maintainer) source_u.maintainer and excuse.set_maint(source_u.maintainer)
source_u.section and excuse.set_section(source_u.section) source_u.section and excuse.set_section(source_u.section)
@ -283,7 +284,7 @@ class ExcuseFinder(object):
else: else:
source_t = None source_t = None
excuse = Excuse(item.name) excuse = Excuse(item)
excuse.set_vers(source_t and source_t.version or None, source_u.version) excuse.set_vers(source_t and source_t.version or None, source_u.version)
source_u.maintainer and excuse.set_maint(source_u.maintainer) source_u.maintainer and excuse.set_maint(source_u.maintainer)
source_u.section and excuse.set_section(source_u.section) source_u.section and excuse.set_section(source_u.section)
@ -477,7 +478,7 @@ class ExcuseFinder(object):
if pkg not in sources_ps: if pkg not in sources_ps:
item = mi_factory.parse_item("-" + pkg, versioned=False, auto_correct=False) item = mi_factory.parse_item("-" + pkg, versioned=False, auto_correct=False)
if should_remove_source(item): if should_remove_source(item):
actionable_items_add(item.name) actionable_items_add(item)
# for every source package in the source suites, check if it should be upgraded # for every source package in the source suites, check if it should be upgraded
for suite in chain((pri_source_suite, *suite_info.additional_source_suites)): for suite in chain((pri_source_suite, *suite_info.additional_source_suites)):
@ -493,7 +494,7 @@ class ExcuseFinder(object):
item = mi_factory.parse_item("%s%s" % (pkg, item_suffix), versioned=False, auto_correct=False) item = mi_factory.parse_item("%s%s" % (pkg, item_suffix), versioned=False, auto_correct=False)
# check if the source package should be upgraded # check if the source package should be upgraded
if should_upgrade_src(item): if should_upgrade_src(item):
actionable_items_add(item.name) actionable_items_add(item)
else: else:
# package has same version in source and target suite; check if any of the # package has same version in source and target suite; check if any of the
# binaries have changed on the various architectures # binaries have changed on the various architectures
@ -501,7 +502,7 @@ class ExcuseFinder(object):
item = mi_factory.parse_item("%s/%s%s" % (pkg, arch, item_suffix), item = mi_factory.parse_item("%s/%s%s" % (pkg, arch, item_suffix),
versioned=False, auto_correct=False) versioned=False, auto_correct=False)
if should_upgrade_srcarch(item): if should_upgrade_srcarch(item):
actionable_items_add(item.name) actionable_items_add(item)
# process the `remove' hints, if the given package is not yet in actionable_items # process the `remove' hints, if the given package is not yet in actionable_items
for hint in self.hints['remove']: for hint in self.hints['remove']:
@ -515,7 +516,8 @@ class ExcuseFinder(object):
continue continue
# add the removal of the package to actionable_items and build a new excuse # add the removal of the package to actionable_items and build a new excuse
excuse = Excuse("-%s" % (src)) item = mi_factory.parse_item("-" + src, versioned=False, auto_correct=False)
excuse = Excuse(item)
excuse.set_vers(tsrcv, None) excuse.set_vers(tsrcv, None)
excuse.addinfo("Removal request by %s" % (hint.user)) excuse.addinfo("Removal request by %s" % (hint.user))
# if the removal of the package is blocked, skip it # if the removal of the package is blocked, skip it
@ -533,7 +535,7 @@ class ExcuseFinder(object):
excuses[excuse.name] = excuse excuses[excuse.name] = excuse
continue continue
actionable_items_add("-%s" % (src)) actionable_items_add(item)
excuse.addinfo("Package is broken, will try to remove") excuse.addinfo("Package is broken, will try to remove")
excuse.add_hint(hint) excuse.add_hint(hint)
# Using "PASS" here as "Created by a hint" != "accepted due to hint". In a future # Using "PASS" here as "Created by a hint" != "accepted due to hint". In a future
@ -547,20 +549,20 @@ class ExcuseFinder(object):
def find_actionable_excuses(self): def find_actionable_excuses(self):
excuses = self.excuses excuses = self.excuses
actionable_items = self._compute_excuses_and_initial_actionable_items() actionable_items = self._compute_excuses_and_initial_actionable_items()
valid = {x.name for x in actionable_items}
# extract the not considered packages, which are in the excuses but not in upgrade_me # extract the not considered packages, which are in the excuses but not in upgrade_me
unconsidered = {ename for ename in excuses if ename not in actionable_items} unconsidered = {ename for ename in excuses if ename not in valid}
invalidated = set() invalidated = set()
invalidate_excuses(excuses, actionable_items, unconsidered, invalidated) invalidate_excuses(excuses, valid, unconsidered, invalidated)
# check that the list of actionable items matches the list of valid # check that the list of actionable items matches the list of valid
# excuses # excuses
assert actionable_items == {x for x in excuses if excuses[x].is_valid} assert valid == {x for x in excuses if excuses[x].is_valid}
# check that the rdeps for all invalid excuses were invalidated # check that the rdeps for all invalid excuses were invalidated
assert invalidated == {x for x in excuses if not excuses[x].is_valid} assert invalidated == {x for x in excuses if not excuses[x].is_valid}
mi_factory = self._migration_item_factory actionable_items = {x for x in actionable_items if x.name in valid}
actionable_items = {mi_factory.parse_item(x, versioned=False, auto_correct=False) for x in actionable_items}
return excuses, actionable_items return excuses, actionable_items