diff -r c7c26511138f -r 7c4a911dc066 buildframework/helium/tools/preparation/ci.ant.xml
--- a/buildframework/helium/tools/preparation/ci.ant.xml Wed Jun 16 16:51:40 2010 +0300
+++ b/buildframework/helium/tools/preparation/ci.ant.xml Fri Aug 13 14:59:05 2010 +0300
@@ -97,10 +97,13 @@
ctime_dict = {}
root_dir = str(attributes.get('rootdir'))
output_dir = str(attributes.get('outputdir'))
-for dir_ in os.listdir(root_dir):
- if (os.path.isdir(os.path.join(root_dir, dir_))):
- dir_ctime = time.strftime('%Y-%m-%d %H:%M:%S', time.localtime(os.path.getctime(os.path.join(root_dir, dir_))))
- ctime_dict[dir_ctime] = dir_
+if os.path.exists(root_dir):
+ for dir_ in os.listdir(root_dir):
+ if (os.path.isdir(os.path.join(root_dir, dir_))):
+ dir_ctime = time.strftime('%Y-%m-%d %H:%M:%S', time.localtime(os.path.getctime(os.path.join(root_dir, dir_))))
+ ctime_dict[dir_ctime] = dir_
+else:
+ self.log("Skipping " + root_dir + " dir because it doesn't exist.")
ctime_list = ctime_dict.keys()
ctime_list.sort()
self.log(str("ctime_list: %s" % ctime_list))
@@ -148,11 +151,18 @@
databases = []
delivery = str(attributes.get('delivery'))
sessionFile = str(attributes.get('sessionfile'))
+engine = project.getProperty('ccm.engine.host')
+dbpath = project.getProperty('ccm.database.path')
+
configBuilder = configuration.NestedConfigurationBuilder(open(delivery, 'r'))
configSet = configBuilder.getConfiguration()
-for config in configSet.getConfigurations():
- if config['database'] not in databases:
- databases.append(config['database'])
+
+if dbpath:
+ databases.append(dbpath)
+else:
+ for config in configSet.getConfigurations():
+ if config['database'] not in databases:
+ databases.append(config['database'])
config = configuration.PropertiesConfiguration()
if os.path.exists(sessionFile):
@@ -175,7 +185,7 @@
if update_session:
try:
self.log(str("Opening a new session for %s..." % database))
- session = nokia.nokiaccm.open_session(database=database)
+ session = nokia.nokiaccm.open_session(database=database, engine=engine, dbpath=dbpath)
session.close_on_exit = False
config[database] = session.addr()
except Exception, exc:
@@ -290,7 +300,7 @@
-
+