Changeset 89b48e in indico

Timestamp:

07/13/10 19:20:02 (3 years ago)

Author:

Pedro Ferreira <jose.pedro.ferreira@…>

Branches:

master, burotel, hello-world-walkthrough, ipv6, new-webex, v0.97-series, v0.98-series, v0.98.2, v0.98.3, v0.98b1, v0.98b2, v0.99, 051b2622c51afb171a1dedb46a0df4fbb0cbd02e, d9941f8582b36b24821a11ea5ba16fda6a457fb1

Children:

8eabfb, 87cf46

Parents:

2cd02b

Message:

[FIX] Couple of bugs in the setup process

• str being raised;
• 'develop' command was being overwritten by our own - renamed ours to 'develop_config';

Files:

• indico/MaKaC/consoleScripts/installBase.py (modified) (1 diff)
• setup.py (modified) (2 diffs)

indico/MaKaC/consoleScripts/installBase.py

@@ -139 +139 @@
                 new_contents = "%s\n%s = %s" % (new_contents, k, str(result_values[k]))
         else:
-            raise 'Invalid config value "%s = %s"' % (k, new_values[k])
+            raise Exception('Invalid config value "%s = %s"' % (k, new_values[k]))
 
     # We write unknown options to the end of the file, they may not be just outdated options but plugins'

setup.py

@@ -293 +293 @@
         ''' % _databaseText('etc')
 
-    def _update_conf_dir_paths(self, filepath, dirs):
+    def _update_conf_dir_paths(self, filePath, dirs):
         fdata = open(filePath).read()
         for dir in dirs.items():
@@ -344 +344 @@
                     'tests': tests_indico,
                     'fetchdeps': fetchdeps_indico,
-                    'develop': develop_indico,
+                    'develop_config': develop_indico,
                     },