Merge lp://staging/~mterry/sessioninstaller/no-defer-twice into lp://staging/sessioninstaller
Proposed by
Michael Terry
| Status: | Merged |
|---|---|
| Merged at revision: | 141 |
| Proposed branch: | lp://staging/~mterry/sessioninstaller/no-defer-twice |
| Merge into: | lp://staging/sessioninstaller |
| Diff against target: |
12 lines (+2/-0) 1 file modified
sessioninstaller/backends/aptd.py (+2/-0) |
| To merge this branch: | bzr merge lp://staging/~mterry/sessioninstaller/no-defer-twice |
| Related bugs: |
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| Michael Vogt (community) | Approve | ||
|
Review via email:
|
|||
Description of the change
Back in the day, I tried to fix bug 848605 with r130.
But that caused bug 1042231, fixed in r132.
But r132 re-opened the original issue. This branch hopefully fixes both issues.
Just checking for deferred call state was the simplest fix I could think of. We still need error_handler in case there is such a problem in aptdaemon that it never even gets to emit "finished".
Though in cases like bug 1056545, aptdaemon calls error_handler because it times out, but then later the dialog emits "finished" when the user cancels the policykit prompt. So we should guard against that.
To post a comment you must log in.
Revision history for this message
| Martin Pitt (pitti) wrote | # |
Preview Diff
[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
Looked good to me, thanks.