Merge ~orndorffgrant/ubuntu/+source/update-manager:tolerate-errors-from-pro-client-api into ubuntu/+source/update-manager:ubuntu/devel
Status: | Merged |
---|---|
Merge reported by: | Grant Orndorff |
Merged at revision: | 445e6c75b420ff903fd41b9a6d33d30ad1f0bc53 |
Proposed branch: | ~orndorffgrant/ubuntu/+source/update-manager:tolerate-errors-from-pro-client-api |
Merge into: | ubuntu/+source/update-manager:ubuntu/devel |
Diff against target: |
36 lines (+12/-2) 2 files modified
UpdateManager/UpdateManager.py (+5/-2) debian/changelog (+7/-0) |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Benjamin Drung (community) | Approve | ||
Julian Andres Klode (community) | Approve | ||
Robert Ancell | Pending | ||
Review via email:
|
Description of the change
The ubuntu pro api function is erroring intermittently (#2015286 #2015113). That's a bug in pro-client - it shouldn't be making any network calls during this function. But it is unlikely to get fixed in time for lunar launch (the fix will hopefully go in as an SRU to lunar shortly after launch).
For now, we can catch any error the pro function might throw and proceed without displaying potential pro updates in that case.
I've also included a fix to use the correct field for the package name (See https:/
There was an error fetching revisions from git servers. Please try again in a few minutes. If the problem persists, contact Launchpad support.
lgtm. I'd probably avoid setting the None and the if, and use try/except: pass/else instead but that's nitpicking and this works to.
Ship it!