Merge ~tormodvolden/update-manager:ppa_changelog into update-manager:main

Proposed by Tormod Volden
Status: Merged
Approved by: Sebastien Bacher
Approved revision: ebe4c1c5a4ae51729810e1c519ad789a5e1da688
Merged at revision: ebe4c1c5a4ae51729810e1c519ad789a5e1da688
Proposed branch: ~tormodvolden/update-manager:ppa_changelog
Merge into: update-manager:main
Diff against target: 13 lines (+1/-1)
1 file modified
UpdateManager/Core/MyCache.py (+1/-1)
Reviewer Review Type Date Requested Status
Sebastien Bacher Approve
Nathan Teodosio (community) Approve
Review via email: mp+467152@code.launchpad.net

Commit message

Display changelogs also for PPA packages on ppa.launchpadcontent.net

https://bugs.launchpad.net/ubuntu/+source/update-manager/+bug/2068809

Description of the change

Please consider this for 24.04 as well.

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

Thanks!

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1diff --git a/UpdateManager/Core/MyCache.py b/UpdateManager/Core/MyCache.py
2index 80557c6..ff93c0b 100644
3--- a/UpdateManager/Core/MyCache.py
4+++ b/UpdateManager/Core/MyCache.py
5@@ -338,7 +338,7 @@ class MyCache(DistUpgrade.DistUpgradeCache.MyCache):
6
7 cdt = self[name].candidate
8 for uri in cdt.uris:
9- if urlsplit(uri).hostname != "ppa.launchpad.net":
10+ if urlsplit(uri).hostname not in ("ppa.launchpad.net", "ppa.launchpadcontent.net"):
11 continue
12 match = re.search("http.*/(.*)/(.*)/ubuntu/.*", uri)
13 if match is not None:

Subscribers

People subscribed via source and target branches