fixed merge

svn: r5489
This commit is contained in:
Don Allingham 2005-12-06 21:09:00 +00:00
parent c7e21a9faf
commit 3dd92a48fe

View File

@ -372,24 +372,24 @@ class ArgHandler:
"supply at least one input file to process." "supply at least one input file to process."
print "Launching interactive session..." print "Launching interactive session..."
if self.parent.cl: # if self.parent.cl:
for (action,options_str) in self.actions: # for (action,options_str) in self.actions:
print "Performing action: %s." % action # print "Performing action: %s." % action
if options_str: # if options_str:
print "Using options string: %s" % options_str # print "Using options string: %s" % options_str
self.cl_action(action,options_str) # self.cl_action(action,options_str)
for expt in self.exports: # for expt in self.exports:
print "Exporting: file %s, format %s." % expt # print "Exporting: file %s, format %s." % expt
self.cl_export(expt[0],expt[1]) # self.cl_export(expt[0],expt[1])
print "Cleaning up." # print "Cleaning up."
# remove import db after use # # remove import db after use
self.parent.db.close() # self.parent.db.close()
if self.imports: # if self.imports:
os.remove(self.imp_db_path) # os.remove(self.imp_db_path)
print "Exiting." # print "Exiting."
os._exit(0) # os._exit(0)
if self.imports: if self.imports:
self.parent.import_tool_callback() self.parent.import_tool_callback()