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

use uvname in excuses output

Browse Source
This commit is contained in:
Ivo De Decker 2020-01-16 14:36:03 +00:00
parent 5c7300caf0
commit 5dc892ae8f
1 changed files with 10 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
britney2/excuse.py
View File

@ -195,6 +195,10 @@ class Excuse(object):
def name(self): def name(self):
return self.item.name return self.item.name
@property
def uvname(self):
return self.item.uvname
@property @property
def source(self): def source(self):
return self.item.package return self.item.package
@ -376,12 +380,12 @@ class Excuse(object):
dep = d.first_dep dep = d.first_dep
info = "" info = ""
if d.valid: if d.valid:
info = "%s: %s <a href=\"#%s\">%s</a>" % (d.deptype, self.name, dep, dep) info = "%s: %s <a href=\"#%s\">%s</a>" % (d.deptype, self.uvname, dep, dep)
elif not d.possible: elif not d.possible:
desc = d.first_impossible_dep desc = d.first_impossible_dep
info = "Impossible %s: %s -> %s" % (d.deptype, self.name, desc) info = "Impossible %s: %s -> %s" % (d.deptype, self.uvname, desc)
else: else:
info = "%s: %s <a href=\"#%s\">%s</a> (not considered)" % (d.deptype, self.name, dep, dep) info = "%s: %s <a href=\"#%s\">%s</a> (not considered)" % (d.deptype, self.uvname, dep, dep)
dep_issues[d.verdict].add("Invalidated by %s" % d.deptype.get_description()) dep_issues[d.verdict].add("Invalidated by %s" % d.deptype.get_description())
dep_issues[d.verdict].add(info) dep_issues[d.verdict].add(info)
@ -397,7 +401,7 @@ class Excuse(object):
def html(self): def html(self):
"""Render the excuse in HTML""" """Render the excuse in HTML"""
res = "<a id=\"%s\" name=\"%s\">%s</a> (%s to %s)\n<ul>\n" % \ res = "<a id=\"%s\" name=\"%s\">%s</a> (%s to %s)\n<ul>\n" % \
(self.name, self.name, self.name, self.ver[0], self.ver[1]) (self.uvname, self.uvname, self.uvname, self.ver[0], self.ver[1])
info = self._text() info = self._text()
for l in info: for l in info:
res += "<li>%s\n" % l res += "<li>%s\n" % l
@ -419,7 +423,7 @@ class Excuse(object):
res = [] res = []
res.append( res.append(
"Migration status for %s (%s to %s): %s" % "Migration status for %s (%s to %s): %s" %
(self.name, self.ver[0], self.ver[1], self._format_verdict_summary())) (self.uvname, self.ver[0], self.ver[1], self._format_verdict_summary()))
if not self.is_valid: if not self.is_valid:
res.append("Issues preventing migration:") res.append("Issues preventing migration:")
for v in sorted(self.verdict_info.keys(), reverse=True): for v in sorted(self.verdict_info.keys(), reverse=True):
@ -439,7 +443,7 @@ class Excuse(object):
"""Render the excuse in as key-value data""" """Render the excuse in as key-value data"""
excusedata = {} excusedata = {}
excusedata["excuses"] = self._text() excusedata["excuses"] = self._text()
excusedata["item-name"] = self.name excusedata["item-name"] = self.uvname
excusedata["source"] = self.source excusedata["source"] = self.source
excusedata["migration-policy-verdict"] = self._policy_verdict.name excusedata["migration-policy-verdict"] = self._policy_verdict.name
excusedata["old-version"] = self.ver[0] excusedata["old-version"] = self.ver[0]