Merge lp:~bilalakhtar/update-manager/unity-launcher-progress into lp:update-manager

Proposed by Bilal Akhtar
Status: Merged
Merge reported by: Michael Vogt
Merged at revision: not available
Proposed branch: lp:~bilalakhtar/update-manager/unity-launcher-progress
Merge into: lp:update-manager
Diff against target: 19 lines (+2/-0)
1 file modified
UpdateManager/backend/InstallBackendAptdaemon.py (+2/-0)
To merge this branch: bzr merge lp:~bilalakhtar/update-manager/unity-launcher-progress
Reviewer Review Type Date Requested Status
Ubuntu Core Development Team Pending
Review via email: mp+63674@code.launchpad.net

Description of the change

**** MERGE THIS BRANCH AFTER https://code.launchpad.net/~bilalakhtar/aptdaemon/unity-integration/+merge/63673 GETS MERGED ****

This branch makes update-manager set appropriate aptdaemon transaction metadata so that aptdaemon recognises it and sends progress info to libunity for display on the Unity launcher.

This branch merge is a part of spec https://blueprints.launchpad.net/ubuntu/+spec/desktop-o-default-apps-unity-integration

To post a comment you must log in.
Revision history for this message
Michael Vogt (mvo) wrote :

I merged this is in a slightly different way using the "UnitySupport" class in update-manager. This avoid the dependency on the aptdaemon change (as written in the aptdaemon one I would like to have it slightly more generic there).

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'UpdateManager/backend/InstallBackendAptdaemon.py'
--- UpdateManager/backend/InstallBackendAptdaemon.py 2011-04-05 13:49:37 +0000
+++ UpdateManager/backend/InstallBackendAptdaemon.py 2011-06-07 10:21:36 +0000
@@ -29,6 +29,7 @@
29 pass29 pass
30 try:30 try:
31 trans = yield self.client.update_cache(defer=True)31 trans = yield self.client.update_cache(defer=True)
32 trans.set_meta_data(unity_client_name="update-manager")
32 yield self._run_in_dialog(trans, self.UPDATE)33 yield self._run_in_dialog(trans, self.UPDATE)
33 except errors.NotAuthorizedError:34 except errors.NotAuthorizedError:
34 self.emit("action-done", self.UPDATE, False, False)35 self.emit("action-done", self.UPDATE, False, False)
@@ -48,6 +49,7 @@
48 trans = yield self.client.commit_packages(49 trans = yield self.client.commit_packages(
49 pkgs_install, reinstall, remove, purge, pkgs_upgrade, 50 pkgs_install, reinstall, remove, purge, pkgs_upgrade,
50 downgrade, defer=True)51 downgrade, defer=True)
52 trans.set_meta_data(unity_client_name="update-manager")
51 yield self._run_in_dialog(trans, self.INSTALL)53 yield self._run_in_dialog(trans, self.INSTALL)
52 except errors.NotAuthorizedError as e:54 except errors.NotAuthorizedError as e:
53 self.emit("action-done", self.INSTALL, False, False)55 self.emit("action-done", self.INSTALL, False, False)

Subscribers

People subscribed via source and target branches

to status/vote changes: