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

Proposed by Bilal Akhtar on 2011-06-07
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
To merge this branch: bzr merge lp:~bilalakhtar/update-manager/unity-launcher-progress
Reviewer Review Type Date Requested Status
Ubuntu Core Development Team 2011-06-07 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.
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

1=== modified file 'UpdateManager/backend/InstallBackendAptdaemon.py'
2--- UpdateManager/backend/InstallBackendAptdaemon.py 2011-04-05 13:49:37 +0000
3+++ UpdateManager/backend/InstallBackendAptdaemon.py 2011-06-07 10:21:36 +0000
4@@ -29,6 +29,7 @@
5 pass
6 try:
7 trans = yield self.client.update_cache(defer=True)
8+ trans.set_meta_data(unity_client_name="update-manager")
9 yield self._run_in_dialog(trans, self.UPDATE)
10 except errors.NotAuthorizedError:
11 self.emit("action-done", self.UPDATE, False, False)
12@@ -48,6 +49,7 @@
13 trans = yield self.client.commit_packages(
14 pkgs_install, reinstall, remove, purge, pkgs_upgrade,
15 downgrade, defer=True)
16+ trans.set_meta_data(unity_client_name="update-manager")
17 yield self._run_in_dialog(trans, self.INSTALL)
18 except errors.NotAuthorizedError as e:
19 self.emit("action-done", self.INSTALL, False, False)

Subscribers

People subscribed via source and target branches

to status/vote changes: