Merge lp:~dobey/ubuntu/quantal/aptdaemon/fix-gobject-imports into lp:ubuntu/quantal/aptdaemon

[dobey]

=== modified file 'debian/changelog'
--- debian/changelog	2012-08-08 15:20:35 +0000
+++ debian/changelog	2012-08-09 19:25:23 +0000
@@ -1,3 +1,11 @@
+aptdaemon (0.45+bzr848-0ubuntu3) quantal; urgency=low
+
+  * debian/patches/fix_gobject_imports.patch:
+    - Check that the item in sys.modules is not None before trying to import.
+      (LP: #1035032)
+
+ -- Rodney Dawes <[e-mail]>  Thu, 09 Aug 2012 15:21:04 -0400
+
 aptdaemon (0.45+bzr848-0ubuntu2) quantal; urgency=low
 
   * debian/patches/fix_gettext_return_value_type.patch:

=== added file 'debian/patches/fix_gobject_imports.patch'
--- debian/patches/fix_gobject_imports.patch	1970-01-01 00:00:00 +0000
+++ debian/patches/fix_gobject_imports.patch	2012-08-09 19:25:23 +0000
@@ -0,0 +1,26 @@
+=== modified file 'aptdaemon/client.py'
+--- old/aptdaemon/client.py	2012-07-12 14:08:43 +0000
++++ new/aptdaemon/client.py	2012-08-09 18:57:09 +0000
+@@ -37,7 +37,7 @@ import dbus.glib
+ import dbus.mainloop.glib
+ dbus.mainloop.glib.DBusGMainLoop(set_as_default=True)
+ 
+-if 'gobject' in sys.modules:
++if 'gobject' in sys.modules and sys.modules['gobject'] is not None:
+     import gobject as GObject
+ else:
+     from gi.repository import GObject
+
+=== modified file 'aptdaemon/debconf.py'
+--- old/aptdaemon/debconf.py	2011-11-25 00:23:33 +0000
++++ new/aptdaemon/debconf.py	2012-08-09 18:57:09 +0000
+@@ -35,7 +35,7 @@ import subprocess
+ import tempfile
+ import sys
+ 
+-if 'gi.repository' in sys.modules:
++if 'gi.repository' in sys.modules and sys.modules['gi.repository'] is not None:
+     from gi.repository import GObject
+ else:
+     import gobject as GObject
+

=== modified file 'debian/patches/series'
--- debian/patches/series	2012-08-08 15:17:22 +0000
+++ debian/patches/series	2012-08-09 19:25:23 +0000
@@ -1,1 +1,2 @@
 fix_gettext_return_value_type.patch
+fix_gobject_imports.patch