thomasvs - in flumotion/branches/platform-3: . common

[flumotion-commit at lists.fluendo.com]

Author: thomasvs
Date: Tue May  8 15:04:50 2007
New Revision: 4889

Modified:
   flumotion/branches/platform-3/   (props changed)
   flumotion/branches/platform-3/common/gendoc.py
Log:
Merged revisions 4773 via svnmerge from 
https://svn.fluendo.com/svn/flumotion/trunk

........
  r4773 | thomasvs | 2007-04-14 20:10:46 +0200 (Sat, 14 Apr 2007) | 1 line
  
  make sure we can generate docs even when we have uninstalled pygtk/pygst
........


Modified: flumotion/branches/platform-3/common/gendoc.py
==============================================================================
--- flumotion/branches/platform-3/common/gendoc.py	(original)
+++ flumotion/branches/platform-3/common/gendoc.py	Tue May  8 15:04:50 2007
@@ -7,6 +7,7 @@
     from misc import setup
     setup.setup()
 except ImportError:
+    print "Not importing misc.setup"
     pass
     
 from flumotion.common import boot
@@ -15,6 +16,11 @@
 from twisted.internet import gtk2reactor
 gtk2reactor.install(useGtk=False)
 
+# reinstall our import hooks that could have been overridden by
+# pygtk/pygst ltihooks
+from flumotion.common import package
+package.getPackager().install()
+
 # monkey patching twisted doc errors
 from twisted.spread import pb
 def login(self, credentials, client=None):