Instances are now opened by a special function that generates a unique

[roundup.git] / roundup-admin

diff --git a/roundup-admin b/roundup-admin
index 47ecd6c4e14e9374901a92578e6ab0957eb5e720..373216541a7270c390d200e6191f94173f643b87 100755 (executable)
--- a/roundup-admin
+++ b/roundup-admin
@@ -1,13 +1,14 @@
 #! /usr/bin/python
-# $Id: roundup-admin,v 1.12 2001-08-03 01:28:33 richard Exp $
+# $Id: roundup-admin,v 1.13 2001-08-05 07:44:13 richard Exp $
 
 import sys
 if int(sys.version[0]) < 2:
     print 'Roundup requires python 2.0 or later.'
     sys.exit(1)
 
-import string, os, getpass, getopt, re, imp
+import string, os, getpass, getopt, re
 from roundup import date, roundupdb, init
+import roundup.instance
 
 def usage(message=''):
     if message: message = 'Problem: '+message+'\n'
@@ -381,7 +382,7 @@ def main():
             password = getpass.getpass('  password: ')
 
     # get the instance
-    instance = imp.load_package('instance', instance_home)
+    instance = roundup.instance.open(instance_home)
 
     function = figureCommands().get(command, None)
 
@@ -404,6 +405,9 @@ if __name__ == '__main__':
 
 #
 # $Log: not supported by cvs2svn $
+# Revision 1.12  2001/08/03 01:28:33  richard
+# Used the much nicer load_package, pointed out by Steve Majewski.
+#
 # Revision 1.11  2001/08/03 00:59:34  richard
 # Instance import now imports the instance using imp.load_module so that
 # we can have instance homes of "roundup" or other existing python package