Merge lp:~rohangarg/usb-creator/fix-for-1315866 into lp:usb-creator

[Rohan Garg]

[Michał Zając (quintasan)]

It fixes the issue for me.

review: Approve

[lp:~rohangarg/usb-creator/fix-for-1315866]

440. By Rohan Garg on 2014-05-05

Changelog++

[Evan (ev)]

Can you explain in a comment in the code exactly why this is
necessary? Please convince me this isn't a hack.

[Rohan Garg (rohangarg)]

Well, it's more of a workaround at the moment while upstream is sorting out this bug, see [1]. I've cleared a similar patch for other PyQt4 projects with upstream, see [2]

[1] http://www.riverbankcomputing.com/pipermail/pyqt/2014-March/033957.html
[2] http://www.riverbankcomputing.com/pipermail/pyqt/2014-April/034016.html

[Evan (ev)]

Sure, but we need to know why it's there and when it's truly safe to
remove. Can you please reference that discussion in a comment in the
code?

[lp:~rohangarg/usb-creator/fix-for-1315866]

441. By Rohan Garg on 2014-05-06

Add more info regarding the workaround in the comments

[Rohan Garg (rohangarg)]

Bump?

[Evan (ev)]

Ah, thanks for re-raising this. I didn't see that you committed a more detailed explanation.

Merging now.

review: Approve

[Rohan Garg (rohangarg)]

Cheerio :)

=== modified file 'bin/usb-creator-kde'
--- bin/usb-creator-kde	2013-01-28 13:24:55 +0000
+++ bin/usb-creator-kde	2014-05-06 13:10:51 +0000
@@ -18,6 +18,8 @@
 import sys
 import logging
 
+import sip
+
 from dbus import DBusException
 
 from PyQt4 import uic
@@ -42,6 +44,15 @@
     setup_logging()
     setup_gettext()
 
+    #FIXME: Workaround for LP: 1315866
+    #       This happens due to the fact that when a Python dict is garbage
+    #       collected the order in which the individual items in the dict are
+    #       garbage collected is unpredictable, causing the dtor's to be called
+    #       after python exits. In order to work around the issue, upstream
+    #       suggested that projects disable the automatic destruction of C++
+    #       instances and C structures
+    #       Ref: http://www.riverbankcomputing.com/pipermail/pyqt/2014-March/033929.html
+    sip.setdestroyonexit(False)
     # Add cmdline options
     options = KCmdLineOptions()
     options.add("i").add("iso <img>", ki18n("provide a source image (CD or raw disk) to pre-populate the UI."))
 
=== modified file 'debian/changelog'
--- debian/changelog	2014-04-01 14:04:42 +0000
+++ debian/changelog	2014-05-06 13:10:51 +0000
@@ -1,3 +1,12 @@
+usb-creator (0.2.57) UNRELEASED; urgency=medium
+
+  * Workaround Python Qt4 being sucky (LP: #1315866)
+    - Known bug in Python Qt4 trying to delete objects twice, workaround by
+      telling SIP to not call dtors on each object, and instead throwing away
+      everything at the end
+
+ -- Rohan Garg <[e-mail]>  Mon, 05 May 2014 12:04:00 +0200
+
 usb-creator (0.2.56) trusty; urgency=medium
 
   [ Ivan Larionov ]