Ubuntu
gnome-codec-install package

Merge lp:~ilidrissi.amine/ubuntu/maverick/gnome-codec-install/fix-bug-615508 into lp:ubuntu/maverick/gnome-codec-install

  1. Maverick (10.10)
  2. fix-bug-615508
  3. Merge into maverick
Proposed by Mohamed Amine Ilidrissi
Status: Merged
Merged at revision: 13
Proposed branch: lp:~ilidrissi.amine/ubuntu/maverick/gnome-codec-install/fix-bug-615508
Merge into: lp:ubuntu/maverick/gnome-codec-install
Diff against target: 59 lines (+19/-7)
2 files modified
GnomeCodecInstall/PackageWorker.py (+12/-7)
debian/changelog (+7/-0)
To merge this branch: bzr merge lp:~ilidrissi.amine/ubuntu/maverick/gnome-codec-install/fix-bug-615508
Reviewer Review Type Date Requested Status
Ubuntu Development Team Pending
Review via email: mp+34207@code.launchpad.net
To post a comment you must log in.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'GnomeCodecInstall/PackageWorker.py'
2--- GnomeCodecInstall/PackageWorker.py 2010-07-16 12:13:01 +0000
3+++ GnomeCodecInstall/PackageWorker.py 2010-08-31 14:53:43 +0000
4@@ -34,13 +34,22 @@
5
6 class PackageWorkerAptdaemon(PackageWorker):
7
8+ (RESULT_SUCCESS, RESULT_FAILURE, RESULT_NOTKNOWN) = range(3)
9+
10 def __init__(self):
11 self.client = client.AptClient()
12- self._result = None
13+ self._result = self.RESULT_NOTKNOWN
14
15 def perform_action(self, parent_window, install, remove):
16 self._perform_action(parent_window, install, remove)
17- return self._result
18+ while self._result == self.RESULT_NOTKNOWN:
19+ while gtk.events_pending():
20+ gtk.main_iteration()
21+ time.sleep(0.01)
22+ if self._result == self.RESULT_SUCCESS:
23+ return True
24+ else:
25+ return False
26
27 @inline_callbacks
28 def _perform_action(self, parent_window, install, remove):
29@@ -61,14 +70,10 @@
30 dia = AptProgressDialog(trans, parent=parent_window)
31 dia.connect("finished", self._on_finished)
32 dia.run()
33- while self._result is None:
34- while gtk.events_pending():
35- gtk.main_iteration()
36- time.sleep(0.01)
37
38 def _on_finished(self, dialog):
39 dialog.hide()
40- self._result = True
41+ self._result = self.RESULT_SUCCESS
42
43
44 class PackageWorkerSynaptic(PackageWorker):
45
46=== modified file 'debian/changelog'
47--- debian/changelog 2010-07-16 12:13:01 +0000
48+++ debian/changelog 2010-08-31 14:53:43 +0000
49@@ -1,3 +1,10 @@
50+gnome-codec-install (0.4.7ubuntu2) maverick; urgency=low
51+
52+ * GnomeCodecInstall/PackageWorker.py: Aptdaemon now installs then
53+ returns a result (LP: #615508)
54+
55+ -- Mohamed Amine IL Idrissi <ilidrissiamine@gmail.com> Tue, 31 Aug 2010 14:50:09 +0000
56+
57 gnome-codec-install (0.4.7ubuntu1) maverick; urgency=low
58
59 * Merge with Debian unstable, remaining Ubuntu changes:

Subscribers

People subscribed via source and target branches