Updated boto.config to allow for BOTO_PATH, and to re-work how $HOME is

handled (or not handled) to make boto work on Windows platforms again
vikalp · Apr 5, 2011 · 33f04cb · 33f04cb
1 parent 1e1bcf7
commit 33f04cb
Showing 1 changed file with 17 additions and 10 deletions.
diff --git a/boto/pyami/config.py b/boto/pyami/config.py
@@ -1,4 +1,5 @@
 # Copyright (c) 2006,2007 Mitch Garnaat http://garnaat.org/
+# Copyright (c) 2011 Chris Moyer http://coredumped.org/
 #
 # Permission is hereby granted, free of charge, to any person obtaining a
 # copy of this software and associated documentation files (the
@@ -23,19 +24,25 @@
 import ConfigParser
 import boto
 
+# By default we use two locations for the boto configurations,
+# /etc/boto.cfg and $HOME/.boto (which is ~/.boto on both Windows and
+# Unix platforms for python)
 BotoConfigPath = '/etc/boto.cfg'
 BotoConfigLocations = [BotoConfigPath]
+UserConfigPath = os.path.expanduser('~/.boto')
+BotoConfigLocations.append(UserConfigPath)
+
+# IF there's a BOTO_CONFIG variable set, we load ONLY 
+# that variable
 if 'BOTO_CONFIG' in os.environ:
-    BotoConfigLocations.append(os.path.expanduser(os.environ['BOTO_CONFIG']))
-elif 'HOME' in os.environ:
-    UserConfigPath = os.path.expanduser('~/.boto')
-    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)
+    BotoConfigLocations[os.path.expanduser(os.environ['BOTO_CONFIG'])]
+
+# If there's a BOTO_PATH variable set, we use anything there
+# as the current configuration locations, split with semicolons
+elif 'BOTO_PATH' in os.environ:
+    BotoConfigLocations = []
+    for path in os.environ['BOTO_PATH'].split(":"):
+        BotoConfigLocations.append(os.path.expanduser(path))
 
 
 class Config(ConfigParser.SafeConfigParser):