[Python-apps-commits] r3509 - in packages/vboxgtk/trunk/debian (3 files)
dktrkranz-guest at users.alioth.debian.org
dktrkranz-guest at users.alioth.debian.org
Sat Aug 22 12:31:42 UTC 2009
Date: Saturday, August 22, 2009 @ 12:31:41
Author: dktrkranz-guest
Revision: 3509
Escape from infinite loop when exiting
Added:
packages/vboxgtk/trunk/debian/patches/04-exit_loop.diff
Modified:
packages/vboxgtk/trunk/debian/changelog
packages/vboxgtk/trunk/debian/patches/series
Modified: packages/vboxgtk/trunk/debian/changelog
===================================================================
--- packages/vboxgtk/trunk/debian/changelog 2009-08-21 23:33:45 UTC (rev 3508)
+++ packages/vboxgtk/trunk/debian/changelog 2009-08-22 12:31:41 UTC (rev 3509)
@@ -18,8 +18,10 @@
- Compatibility with Python 2.5.
* debian/patches/03-sys.path_directories.diff:
- Integrate sys.path with Virtualbox modules locations.
+ * debian/patches/04_exit_loop.diff:
+ - Escape from infinite loop when exiting.
- -- Devid Antonio Filoni <d.filoni at ubuntu.com> Sun, 16 Aug 2009 00:14:24 +0200
+ -- Devid Antonio Filoni <d.filoni at ubuntu.com> Sat, 22 Aug 2009 14:21:22 +0200
vboxgtk (0.4.1-1) unstable; urgency=low
Added: packages/vboxgtk/trunk/debian/patches/04-exit_loop.diff
===================================================================
--- packages/vboxgtk/trunk/debian/patches/04-exit_loop.diff (rev 0)
+++ packages/vboxgtk/trunk/debian/patches/04-exit_loop.diff 2009-08-22 12:31:41 UTC (rev 3509)
@@ -0,0 +1,49 @@
+Escape from infinite loop when exiting.
+
+Index: vboxgtk-0.5.0/vboxgtk/vboxdao_xpcom.py
+===================================================================
+--- vboxgtk-0.5.0.orig/vboxgtk/vboxdao_xpcom.py 2009-08-22 14:18:47.000000000 +0200
++++ vboxgtk-0.5.0/vboxgtk/vboxdao_xpcom.py 2009-08-22 14:18:39.000000000 +0200
+@@ -43,7 +43,10 @@
+ time.sleep(0.5)
+ # Random VirtualBox API function. Needed to activate the
+ # callback. Will be fixed VirtualBox 3.0:
+- self.vbox.getGuestOSTypes()
++ if self.vbox:
++ self.vbox.getGuestOSTypes()
++ else:
++ break
+ return 0
+
+
+@@ -118,12 +121,12 @@
+
+ def start(self):
+ self.vbox.registerCallback(self.cb)
+- thread = ListenerThread(self.vbox);
+- thread.daemon = True
+- thread.start()
++ self.thread = ListenerThread(self.vbox);
++ self.thread.daemon = True
++ self.thread.start()
+
+ def exit(self):
+- return False
++ self.thread.vbox = None
+
+ ## Session
+
+Index: vboxgtk-0.5.0/vboxgtk/vboxgtk_iface.py
+===================================================================
+--- vboxgtk-0.5.0.orig/vboxgtk/vboxgtk_iface.py 2009-08-22 14:18:46.000000000 +0200
++++ vboxgtk-0.5.0/vboxgtk/vboxgtk_iface.py 2009-08-22 14:17:20.000000000 +0200
+@@ -786,6 +786,8 @@
+
+
+ def main():
+- VBoxGtk(vboxdao_xpcom.VBoxDaoXpcom())
++ vboxdao = vboxdao_xpcom.VBoxDaoXpcom()
++ VBoxGtk(vboxdao)
+ gtk.gdk.threads_init()
+ gtk.main()
++ vboxdao.exit()
Modified: packages/vboxgtk/trunk/debian/patches/series
===================================================================
--- packages/vboxgtk/trunk/debian/patches/series 2009-08-21 23:33:45 UTC (rev 3508)
+++ packages/vboxgtk/trunk/debian/patches/series 2009-08-22 12:31:41 UTC (rev 3509)
@@ -1,3 +1,4 @@
01-desktop-file.diff
02-Python2.5_compatibility.diff
03-sys.path_directories.diff
+04-exit_loop.diff
More information about the Python-apps-commits
mailing list