Merge lp:~seb128/ubuntu-archive-scripts/display-components-mismatch into lp:ubuntu-archive-scripts

Proposed by Sebastien Bacher
Status: Merged
Merged at revision: 299
Proposed branch: lp:~seb128/ubuntu-archive-scripts/display-components-mismatch
Merge into: lp:ubuntu-archive-scripts
Diff against target: 51 lines (+16/-0)
2 files modified
generate-team-p-m (+6/-0)
templates/team-report.html (+10/-0)
To merge this branch: bzr merge lp:~seb128/ubuntu-archive-scripts/display-components-mismatch
Reviewer Review Type Date Requested Status
Steve Langasek Approve
Review via email: mp+391370@code.launchpad.net

Commit message

Display component mismatch information in the team report

To post a comment you must log in.
Revision history for this message
Sebastien Bacher (seb128) wrote :

That's a bit hackish but seems there is no better way from the yaml currently available (or we would need to add a new section to the proposed migration output that can be parsed)

296. By Sebastien Bacher

Display component mismatch information in the team report

Revision history for this message
Sebastien Bacher (seb128) wrote :

example output on

https://people.canonical.com/~seb128/reportmismatch.html

the lintian entry is one example

Revision history for this message
Steve Langasek (vorlon) :
review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'generate-team-p-m'
--- generate-team-p-m 2020-09-18 15:04:17 +0000
+++ generate-team-p-m 2020-09-25 14:26:50 +0000
@@ -193,6 +193,7 @@
193 unsatdepends = attr.ib(default=None) # [string]193 unsatdepends = attr.ib(default=None) # [string]
194 unsatbuilddep = attr.ib(default=None) # [string]194 unsatbuilddep = attr.ib(default=None) # [string]
195 brokenbin = attr.ib(default=None) # [string]195 brokenbin = attr.ib(default=None) # [string]
196 componentmismatch = attr.ib(default=None) # [string]
196197
197 _age = attr.ib(default=None)198 _age = attr.ib(default=None)
198199
@@ -267,6 +268,7 @@
267 in_proposed_packages[source_package_name] = prob268 in_proposed_packages[source_package_name] = prob
268 prob.regressions = []269 prob.regressions = []
269 prob.waiting = []270 prob.waiting = []
271 prob.componentmismatch = []
270 # The verdict entries are not items to list on the report272 # The verdict entries are not items to list on the report
271 for policy in ['autopkgtest', 'update-excuse', 'block-bugs']:273 for policy in ['autopkgtest', 'update-excuse', 'block-bugs']:
272 try:274 try:
@@ -290,6 +292,10 @@
290 prob.regressions.append(regr)292 prob.regressions.append(regr)
291 if wait_arches:293 if wait_arches:
292 prob.waiting.append((package + ": " + ", ".join(wait_arches)))294 prob.waiting.append((package + ": " + ", ".join(wait_arches)))
295 if 'depends' in item['reason']:
296 for l in item['excuses']:
297 if 'cannot depend on' in l:
298 prob.componentmismatch.append(l)
293 if 'dependencies' in item and 'unsatisfiable-dependencies' in item['dependencies']:299 if 'dependencies' in item and 'unsatisfiable-dependencies' in item['dependencies']:
294 unsatd = defaultdict(list)300 unsatd = defaultdict(list)
295 for arch, packages in item['dependencies']['unsatisfiable-dependencies'].items():301 for arch, packages in item['dependencies']['unsatisfiable-dependencies'].items():
296302
=== modified file 'templates/team-report.html'
--- templates/team-report.html 2020-09-17 19:50:01 +0000
+++ templates/team-report.html 2020-09-25 14:26:50 +0000
@@ -116,6 +116,16 @@
116 {% if prob.brokenbin %}116 {% if prob.brokenbin %}
117 <li>Binaries broken by the update: {{ prob.brokenbin | join(' ') }}</li>117 <li>Binaries broken by the update: {{ prob.brokenbin | join(' ') }}</li>
118 {% endif %}118 {% endif %}
119 {% if prob.componentmismatch %}
120 <li>
121 Component mismatch entries
122 <ul>
123 {% for component in prob.componentmismatch %}
124 <li> {{ component }} </li>
125 {% endfor %}
126 </ul>
127 </li>
128 {% endif %}
119 {% if d["policy_info"]["block-bugs"] %}129 {% if d["policy_info"]["block-bugs"] %}
120 <li>Blocked by bug:130 <li>Blocked by bug:
121 {% for bug in d["policy_info"]["block-bugs"]|map("int")|sort|map("string") %}131 {% for bug in d["policy_info"]["block-bugs"]|map("int")|sort|map("string") %}

Subscribers

People subscribed via source and target branches