Merge lp:~gandelman-a/glance/lp828719 into lp:glance/diablo

[Adam Gandelman]

Resolves bug #828719, which can potentially cause problems depending on what $PWD commands are executed in.

Unmerged revisions

206. By Adam Gandelman on 2011-08-24

Update Authors

205. By Adam Gandelman on 2011-08-24

Remove "." from list of possible config_file_dirs (LP #828719)

=== modified file 'Authors'
--- Authors	2011-08-15 19:58:57 +0000
+++ Authors	2011-08-24 18:46:17 +0000
@@ -1,3 +1,4 @@
+Adam Gandelman <[e-mail]>
 Andrey Brindeyev <[e-mail]>
 Brian Lamar <[e-mail]>
 Brian Waldon <[e-mail]>
 
=== modified file 'glance/common/config.py'
--- glance/common/config.py	2011-08-11 20:15:33 +0000
+++ glance/common/config.py	2011-08-24 18:46:17 +0000
@@ -189,7 +189,6 @@
     * If --config-file option is used, use that
     * If args[0] is a file, use that
     * Search for $app.conf in standard directories:
-        * .
         * ~.glance/
         * ~
         * /etc/glance
@@ -207,8 +206,7 @@
             return fix_path(args[0])
 
     # Handle standard directory search for $app_name.conf
-    config_file_dirs = [fix_path(os.getcwd()),
-                        fix_path(os.path.join('~', '.glance')),
+    config_file_dirs = [fix_path(os.path.join('~', '.glance')),
                         fix_path('~'),
                         '/etc/glance/',
                         '/etc']
@@ -228,7 +226,6 @@
     * If --config-file option is used, use that
     * If args[0] is a file, use that
     * Search for $app_name.conf in standard directories:
-        * .
         * ~.glance/
         * ~
         * /etc/glance
@@ -264,7 +261,6 @@
     * If --config-file option is used, use that
     * If args[0] is a file, use that
     * Search for $app_name.conf in standard directories:
-        * .
         * ~.glance/
         * ~
         * /etc/glance