Changeset 8b1769 in indico

Timestamp:

02/18/10 15:21:06 (3 years ago)

Author:

Pedro Ferreira <jose.pedro.ferreira@…>

Branches:

master, burotel, hello-world-walkthrough, ipv6, new-webex, prov-dual-interface, v0.97-series, v0.98-series, v0.98.2, v0.98.3, v0.98b1, v0.98b2, v0.99, 051b2622c51afb171a1dedb46a0df4fbb0cbd02e, 43311dd25516d54f5852ee459948998035e08952

Children:

24a4db

Parents:

91d2ae

Message:

[FIX] setup.py - merging config files

• solved problem with dictionaries;
• fixes #202;

File:

• indico/MaKaC/consoleScripts/installBase.py (modified) (6 diffs)

indico/MaKaC/consoleScripts/installBase.py

@@ -91 +91 @@
     new_values.update(mixinValues)
 
+
     # We have to preserve options not currently present in the bundled indico.conf because they
     # may belong to a plugin. This functionality can lead to forget adding new options to
@@ -103 +104 @@
     # We update a current copy of indico.conf with the new values
     new_contents = open(new_conf).read()
+
     for k in new_values:
         if new_values[k].__class__ == str:
@@ -125 +127 @@
 
         elif new_values[k].__class__ == dict:
-            regexp = re.compile('^(%s[ ]*=[ ]*)[\{]{1}([^\}]+)[\}]{1}' % k, re.MULTILINE)
+            regexp = re.compile('^(%s[ ]*=[ ]*)[\{](.+)[\}$]' % k, re.MULTILINE)
             if regexp.search(new_contents):
                 new_contents = re.sub(regexp, "\\g<1>%s" % str(result_values[k]), new_contents)
@@ -141 +143 @@
 
     # We write unknown options to the end of the file, they may not be just outdated options but plugins'
+
     open(existing_conf, 'w').write(new_contents)
 
@@ -485 +488 @@
         del targetDirs['db']
 
+    print "Creating directories for resources... ",
     # Create the directories where the resources will be installed
     createDirs(targetDirs)
+    print "done!"
 
     # target configuration file (may exist or not)
     newConf = os.path.join(targetDirs['etc'],'indico.conf')
     # source configuration file (package)
-    sourceConf = os.path.join(sourceDirs['etc'], 'indico.conf')
+    sourceConf = os.path.join(sourceDirs['etc'], 'indico.conf.sample')
 
     # if there is a source config
@@ -499 +504 @@
             shutil.copy(sourceConf, newConf)
         else:
+            print "Upgrading indico.conf...",
             # upgrade the existing one
-            upgrade_indico_conf(sourceConf, newConf)
+            upgrade_indico_conf(newConf, sourceConf)
+            print "done!"
 
     # change MaKaCConfig.py to include the config