Merge pull request ansible#4453 from pschwartz/fix_cfg_load_order_to_…

…match_docs ansibleGH-4452 Corrected config load order to match docs
shift · Oct 11, 2013 · d73a5da · d73a5da
2 parents e4036b1 + 65c8c69
commit d73a5da
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/lib/ansible/constants.py b/lib/ansible/constants.py
@@ -56,8 +56,8 @@ def _get_config(p, section, key, env_var, default, boolean=True):
 
 def load_config_file():
     p = ConfigParser.ConfigParser()
-    path1 = os.path.expanduser(os.environ.get('ANSIBLE_CONFIG', "~/.ansible.cfg"))
-    path2 = os.getcwd() + "/ansible.cfg"
+    path1 = os.getcwd() + "/ansible.cfg"
+    path2 = os.path.expanduser(os.environ.get('ANSIBLE_CONFIG', "~/.ansible.cfg"))
     path3 = "/etc/ansible/ansible.cfg"
 
     if os.path.exists(path1):