Merge lp:~rohangarg/software-properties/fix-for-1307170 into lp:software-properties

[Rohan Garg]

[lp:~rohangarg/software-properties/fix-for-1307170]

901. By Rohan Garg on 2014-04-13

Remove superfluous carriage returns

[KDEUSER56 (kdeuser56)]

Solves the issue for me with high probability (this is an issue not reproducible every time, so one cannot confirm 100%), but I tried it quite often and it does not crash anymore

review: Approve

[lp:~rohangarg/software-properties/fix-for-1307170]

902. By Rohan Garg on 2014-04-14

Documentation++

903. By Rohan Garg on 2014-04-14

Fix changelog

904. By Rohan Garg on 2014-04-14

Indentation--

[Harald Sitter (apachelogger)]

review: Approve

=== modified file 'debian/changelog'
--- debian/changelog	2014-04-04 06:52:18 +0000
+++ debian/changelog	2014-04-14 09:41:43 +0000
@@ -1,3 +1,10 @@
+software-properties (0.92.35ubuntu1) UNRELEASED; urgency=medium
+
+  * software-properties-kde : Work around crash in sip by skipping the
+    destructors of SIP objects. (LP: #1307170)
+
+ -- Rohan Garg <[e-mail]>  Mon, 14 Apr 2014 11:36:28 +0200
+
 software-properties (0.92.35) trusty; urgency=low
 
   * Add "Additional Drivers" desktop file for the non {GNOME,Unity,KDE}

=== modified file 'software-properties-kde'
--- software-properties-kde	2012-07-05 13:32:44 +0000
+++ software-properties-kde	2014-04-14 09:41:43 +0000
@@ -37,6 +37,8 @@
 from PyKDE4.kdecore import ki18n, KAboutData, KCmdLineArgs , KCmdLineOptions
 from PyKDE4.kdeui import KApplication, KMessageBox
 
+import sip
+
 class OptionParsed:
   debug = False
   massive_debug = False
@@ -46,6 +48,11 @@
 
 #--------------- main ------------------
 if __name__ == '__main__':
+  # Workaround for LP:1307170
+  try:
+    sip.setdestroyonexit(False)
+  except AttributeError:
+    pass
   _ = gettext.gettext
 
   appName     = "softwarepropertieskde"