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
=== modified file 'GnomeCodecInstall/PackageWorker.py'
--- GnomeCodecInstall/PackageWorker.py 2010-07-16 12:13:01 +0000
+++ GnomeCodecInstall/PackageWorker.py 2010-08-31 14:53:43 +0000
@@ -34,13 +34,22 @@
3434
35class PackageWorkerAptdaemon(PackageWorker):35class PackageWorkerAptdaemon(PackageWorker):
3636
37 (RESULT_SUCCESS, RESULT_FAILURE, RESULT_NOTKNOWN) = range(3)
38
37 def __init__(self):39 def __init__(self):
38 self.client = client.AptClient()40 self.client = client.AptClient()
39 self._result = None41 self._result = self.RESULT_NOTKNOWN
4042
41 def perform_action(self, parent_window, install, remove):43 def perform_action(self, parent_window, install, remove):
42 self._perform_action(parent_window, install, remove)44 self._perform_action(parent_window, install, remove)
43 return self._result45 while self._result == self.RESULT_NOTKNOWN:
46 while gtk.events_pending():
47 gtk.main_iteration()
48 time.sleep(0.01)
49 if self._result == self.RESULT_SUCCESS:
50 return True
51 else:
52 return False
4453
45 @inline_callbacks54 @inline_callbacks
46 def _perform_action(self, parent_window, install, remove):55 def _perform_action(self, parent_window, install, remove):
@@ -61,14 +70,10 @@
61 dia = AptProgressDialog(trans, parent=parent_window)70 dia = AptProgressDialog(trans, parent=parent_window)
62 dia.connect("finished", self._on_finished)71 dia.connect("finished", self._on_finished)
63 dia.run()72 dia.run()
64 while self._result is None:
65 while gtk.events_pending():
66 gtk.main_iteration()
67 time.sleep(0.01)
6873
69 def _on_finished(self, dialog):74 def _on_finished(self, dialog):
70 dialog.hide()75 dialog.hide()
71 self._result = True76 self._result = self.RESULT_SUCCESS
7277
7378
74class PackageWorkerSynaptic(PackageWorker):79class PackageWorkerSynaptic(PackageWorker):
7580
=== modified file 'debian/changelog'
--- debian/changelog 2010-07-16 12:13:01 +0000
+++ debian/changelog 2010-08-31 14:53:43 +0000
@@ -1,3 +1,10 @@
1gnome-codec-install (0.4.7ubuntu2) maverick; urgency=low
2
3 * GnomeCodecInstall/PackageWorker.py: Aptdaemon now installs then
4 returns a result (LP: #615508)
5
6 -- Mohamed Amine IL Idrissi <ilidrissiamine@gmail.com> Tue, 31 Aug 2010 14:50:09 +0000
7
1gnome-codec-install (0.4.7ubuntu1) maverick; urgency=low8gnome-codec-install (0.4.7ubuntu1) maverick; urgency=low
29
3 * Merge with Debian unstable, remaining Ubuntu changes:10 * Merge with Debian unstable, remaining Ubuntu changes:

Subscribers

People subscribed via source and target branches