Scary looking python patch; separate the C-module stuff from pure python for the benefit of OSes which keep them separately.

src/apps/admin/bongo/admintool/AgentCommands.py

@@ -11,7 +11,7 @@ from bongo.cmdparse import Command
 
 from bongo import Privs, Xpl
 from bongo.admin import Schema, Util
-from bongo.bootstrap import msgapi
+from libbongo.bootstrap import msgapi
 from bongo.Console import wrap
 from bongo.MDB import MDB, MDBError
 

src/apps/admin/bongo/admintool/CmdUtil.py

@@ -22,7 +22,7 @@ def GetAttributeArgs(*objClasses):
     return args
 
 def GetAgentArgs():
-    from bongo.bootstrap import msgapi
+    from libbongo.bootstrap import msgapi
 
     attrs = {}
 

src/apps/admin/bongo/admintool/DemoCommands.py

@@ -118,7 +118,7 @@ class DemoCommand(Command):
                     store.Flag(uid, DocFlags.Starred, FlagMode.Add)
 
     def ImportCalendars(self, storename, demo) :
-        from bongo.libs import msgapi
+        from libbongo.libs import msgapi
 
         dirname = demopath + "/calendars"
 
@@ -140,7 +140,7 @@ class DemoCommand(Command):
             msgapi.IcsImport(storename, calname, None, "file://" + path, None, None)
 
     def run(self, options, args):
-        from bongo.libs import msgapi
+        from libbongo.libs import msgapi
 
         if len(args) > 0:
             self.print_usage()

src/apps/admin/bongo/admintool/MdbUtil.py

@@ -20,7 +20,7 @@ def GetMdb(options, inSetup=False):
     return MDB(user, options.authpass)
 
 def GetContext(mdbDn, defContext=None):
-    from bongo.libs import msgapi
+    from libbongo.libs import msgapi
 
     if '\\' in mdbDn:
         return mdbDn.rsplit('\\', 1)

src/apps/admin/bongo/admintool/ServerCommands.py

@@ -11,7 +11,7 @@ from bongo.cmdparse import Command
 
 from bongo import Privs, Xpl
 from bongo.admin import Schema, Util
-from bongo.bootstrap import msgapi
+from libbongo.bootstrap import msgapi
 from bongo.Console import wrap
 
 import MdbUtil

src/apps/admin/bongo/admintool/SetupCommands.py

@@ -10,7 +10,7 @@ from bongo.cmdparse import Command
 
 from bongo import Privs, Xpl
 from bongo.admin import Schema, Util
-from bongo.bootstrap import msgapi
+from libbongo.bootstrap import msgapi
 from bongo.Console import wrap
 from bongo.MDB import MDB
 

src/apps/admin/bongo/admintool/UserCommands.py

@@ -11,7 +11,7 @@ from bongo.cmdparse import Command
 
 from bongo import Privs, Xpl
 from bongo.admin import Schema, Util
-from bongo.bootstrap import msgapi
+from libbongo.bootstrap import msgapi
 from bongo.Console import wrap
 from bongo.MDB import MDB, MDBError