Merge pull request #822 from jmchilton/db_test_fix

Fix db initialization when galaxy.ini doesn't exist.
galaxyproject · Oct 1, 2015 · c133078 · c133078
2 parents d8ce3c2 + 6592a14
commit c133078
Showing 1 changed file with 3 additions and 1 deletion.
diff --git a/lib/galaxy/model/orm/scripts.py b/lib/galaxy/model/orm/scripts.py
@@ -71,8 +71,10 @@ def read_config_file_arg( argv, default, old_default ):
     else:
         if not os.path.exists( default ) and os.path.exists( old_default ):
             config_file = old_default
-        else:
+        elif os.path.exists( default ):
             config_file = default
+        else:
+            config_file = default + ".sample"
     return config_file