Merge lp:~marcustomlinson/update-manager/update-manager into lp:update-manager

Proposed by Marcus Tomlinson on 2020-04-23
Status: Merged
Merged at revision: 2886
Proposed branch: lp:~marcustomlinson/update-manager/update-manager
Merge into: lp:update-manager
Diff against target: 26 lines (+7/-1)
2 files modified
UpdateManager/backend/__init__.py (+1/-1)
debian/changelog (+6/-0)
To merge this branch: bzr merge lp:~marcustomlinson/update-manager/update-manager
Reviewer Review Type Date Requested Status
Brian Murray 2020-04-23 Pending
Ubuntu Core Development Team 2020-04-23 Pending
Review via email: mp+382863@code.launchpad.net

Commit message

Fix intermittent hang during snap updates.

To post a comment you must log in.
2886. By Brian Murray on 2020-04-23

Fix intermittent hang during snap updates (LP: #1874469).

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'UpdateManager/backend/__init__.py'
--- UpdateManager/backend/__init__.py 2020-04-16 10:38:22 +0000
+++ UpdateManager/backend/__init__.py 2020-04-23 15:18:42 +0000
@@ -224,7 +224,7 @@
224 # change.get_tasks() can increase between callbacks so we must224 # change.get_tasks() can increase between callbacks so we must
225 # avoid jumping backward in progress here225 # avoid jumping backward in progress here
226 if total_fraction > progress_bar.get_fraction():226 if total_fraction > progress_bar.get_fraction():
227 progress_bar.set_fraction(total_fraction)227 GLib.idle_add(progress_bar.set_fraction, total_fraction)
228228
229 def update_snaps(self):229 def update_snaps(self):
230 # update status and progress bar230 # update status and progress bar
231231
=== modified file 'debian/changelog'
--- debian/changelog 2020-04-16 17:59:56 +0000
+++ debian/changelog 2020-04-23 15:18:42 +0000
@@ -1,3 +1,9 @@
1update-manager (1:20.04.9) focal; urgency=medium
2
3 * Fix intermittent hang during snap updates (LP: #1874469).
4
5 -- Marcus Tomlinson <marcus.tomlinson@canonical.com> Thu, 23 Apr 2020 16:14:21 +0100
6
1update-manager (1:20.04.8) focal; urgency=medium7update-manager (1:20.04.8) focal; urgency=medium
28
3 * Remove ubuntu-support-status as the term support can be confusing and the9 * Remove ubuntu-support-status as the term support can be confusing and the

Subscribers

People subscribed via source and target branches

to status/vote changes: