Software Updater

Merge lp://qastaging/~mterry/update-manager/stop-update into lp://qastaging/update-manager

stop-update
Merge into main

Proposed by Michael Terry on 2012-08-20

Status:	Merged
Merged at revision:	2538
Proposed branch:	lp://qastaging/~mterry/update-manager/stop-update
Merge into:	lp://qastaging/update-manager
Diff against target:	389 lines (+173/-65) 7 files modified UpdateManager/Dialogs.py (+12/-0) UpdateManager/UpdateManager.py (+31/-14) UpdateManager/UpdateProgress.py (+1/-6) UpdateManager/UpdatesAvailable.py (+36/-36) UpdateManager/backend/InstallBackendAptdaemon.py (+3/-0) data/gtkbuilder/UpdateManager.ui (+40/-9) tests/test_stop_update.py (+50/-0)
To merge this branch:	bzr merge lp://qastaging/~mterry/update-manager/stop-update
Related bugs:	Link a bug report

Reviewer	Review Type	Date Requested	Status
Michael Vogt (community)		2012-08-20	Approve on 2012-08-24
Review via email: mp+120318@code.qastaging.launchpad.net

Description of the change

mpt added some dialogs recently to the update-manager experience if the user stops an apt update. See https://wiki.ubuntu.com/SoftwareUpdates#Launching

This branch implements those changes (and does a little minor cleanup in UpdatesAvailable by dropping some support for num_updates == 0 which shouldn't ever happen now, after the redesign).

Revision history for this message

Michael Vogt (mvo) wrote on 2012-08-24:

On Mon, Aug 20, 2012 at 02:45:38AM -0000, Michael Terry wrote:
[..]
> @@ -162,7 +163,7 @@
>
> self._start_pane(UpdateProgress(self))
>
> - def start_available(self):
> + def start_available(self, cancelled_update = False):
> self._look_busy()
> self.refresh_cache()
[..]
> === modified file 'UpdateManager/UpdatesAvailable.py'
> --- UpdateManager/UpdatesAvailable.py 2012-06-28 00:09:03 +0000
> +++ UpdateManager/UpdatesAvailable.py 2012-08-20 02:44:22 +0000
> @@ -81,7 +81,7 @@
>
> class UpdatesAvailable(SimpleGtkbuilderApp):
>
> - def __init__(self, app):
> + def __init__(self, app, header = None, desc = None):
> self.window_main = app
> self.datadir = app.datadir
> self.options = app.options

pep8 suggests to use "cancelled_update=False" (no space around the
"=").

Otherwise this looks good, would be nice to have a test, but to get it
in before UIF I'm fine with merging it now.

Thanks,
Michael

Revision history for this message

Michael Vogt (mvo) on 2012-08-24:

review: Approve

lp://qastaging/~mterry/update-manager/stop-update updated on 2012-08-24

2536. By Michael Terry on 2012-08-24: merge from trunk
2537. By Michael Terry on 2012-08-24: merge from trunk again
2538. By Michael Terry on 2012-08-24: fix pep8 and pyflakes issues
2539. By Michael Terry on 2012-08-24: adjust code to make the UpdateManager class slightly easier to unit test; add tests for stop-update code