diff options
| author | Chris Moyer <kopertop@gmail.com> | 2011-04-04 10:23:02 -0400 |
|---|---|---|
| committer | Chris Moyer <kopertop@gmail.com> | 2011-04-04 10:23:02 -0400 |
| commit | 31f8292423f345ff69ce92a6f81ec6c2ffe468fb (patch) | |
| tree | 2629cbb0f5dee2b11d39d3474ea11ff275c415dc /boto/pyami | |
| parent | 5b5ecdca0c2254dceda6d78ce7864674f1f6fee4 (diff) | |
| parent | 1f70508324e34e3995323daa56b656c4040beda9 (diff) | |
| download | boto-31f8292423f345ff69ce92a6f81ec6c2ffe468fb.tar.gz | |
Merge branch 'master' of https://github.com/boto/boto
Conflicts:
boto/pyami/config.py
Diffstat (limited to 'boto/pyami')
| -rw-r--r-- | boto/pyami/config.py | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/boto/pyami/config.py b/boto/pyami/config.py index 5da89c58..2f14bbb8 100644 --- a/boto/pyami/config.py +++ b/boto/pyami/config.py @@ -32,6 +32,11 @@ elif 'HOME' in os.environ: BotoConfigLocations.append(UserConfigPath) else: UserConfigPath = None + __home_dir = os.path.expanduser('~') + if __home_dir and __home_dir != '~': + UserConfigPath = os.path.join(__home_dir, '.boto') + BotoConfigLocations.append(UserConfigPath) + class Config(ConfigParser.SafeConfigParser): |