ProTo: Fixed bug in GalaxyConfigParser in startup.

elixir-oslo · Nov 24, 2016 · dc5a57a · dc5a57a
1 parent 82aabe5
commit dc5a57a
Showing 1 changed file with 6 additions and 6 deletions.
diff --git a/lib/proto/config/GalaxyConfigParser.py b/lib/proto/config/GalaxyConfigParser.py
@@ -13,16 +13,16 @@ class GalaxyConfigParser(SafeConfigParser):
     def __init__(self):
         SafeConfigParser.__init__(self, {'here': GALAXY_BASE_DIR})
 
-        configRelFn = os.environ.get('GALAXY_CONFIG_FILE')
-
-        if not configRelFn:
-            for configRelFn in ['config/galaxy.ini', 'config/galaxy.ini.sample']:
+        for configRelFn in [os.environ.get('GALAXY_CONFIG_FILE'),
+                            'config/galaxy.ini',
+                            'config/galaxy.ini.sample']:
+            if configRelFn:
                 configFn = GALAXY_BASE_DIR + '/' + configRelFn
                 if os.path.exists(configFn):
                     self.read(configFn)
                     break
-            else:
-                raise Exception('No Galaxy config file found at path: ' + configFn)
+        else:
+            raise Exception('No Galaxy config file found at path: ' + configFn)
 
     def getWithDefault(self, key, default, section='app:main'):
         try: