Rev 14: [merge] Robert Widhopf-Fenk: Updates for newer bzr api changes. in http://bzr.arbash-meinel.com/plugins/DEACTIVATED/service

[John Arbash Meinel]

At http://bzr.arbash-meinel.com/plugins/DEACTIVATED/service

------------------------------------------------------------
revno: 14
revision-id: john at arbash-meinel.com-20070405143341-vbx9kndvrp3vls0q
parent: john at arbash-meinel.com-20060621221817-2962318dfa411328
parent: widhopf at wir-20070404164858-2vyhbza9bg0guj7x
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: service
timestamp: Thu 2007-04-05 09:33:41 -0500
message:
  [merge] Robert Widhopf-Fenk: Updates for newer bzr api changes.
modified:
  __init__.py                    __init__.py-20051004025535-884c6b3748ffc2cb
    ------------------------------------------------------------
    revno: 13.1.2
    merged: widhopf at wir-20070404164858-2vyhbza9bg0guj7x
    parent: widhopf at wir-20070404164810-id1ev10m4r28n58p
    committer: Robert Widhopf <widhopf at WIR>
    branch nick: service
    timestamp: Wed 2007-04-04 18:48:58 +0200
    message:
      Made import more robust against errors and print them!
    ------------------------------------------------------------
    revno: 13.1.1
    merged: widhopf at wir-20070404164810-id1ev10m4r28n58p
    parent: john at arbash-meinel.com-20060621221817-2962318dfa411328
    committer: Robert Widhopf <widhopf at WIR>
    branch nick: service
    timestamp: Wed 2007-04-04 18:48:10 +0200
    message:
      Removed call to bzrlib.trace.log_startup which does not exist anymore.
-------------- next part --------------
=== modified file '__init__.py'
--- a/__init__.py	2006-06-21 22:18:17 +0000
+++ b/__init__.py	2007-04-04 16:48:58 +0000
@@ -23,7 +23,6 @@
             bytes = struct.unpack('>I', self.rfile.read(4))[0]
             args.append(self.rfile.read(bytes))
 
-        bzrlib.trace.log_startup(args)
         retcode, stdout = run_bzr_captured(args)
 
         self.wfile.write(struct.pack('>I', retcode))
@@ -42,7 +41,8 @@
     def try_import(name):
         try:
             __import__(name)
-        except ImportError:
+        except Exception, inst:
+            print type(inst), inst
             pass
 
     all_modules = [