Merge branch 'master' of github.com:LuminalOSS/credstash

fugue · Jun 15, 2015 · b4e397f · b4e397f
2 parents 22143e3 + 34ece93
commit b4e397f
Showing 1 changed file with 5 additions and 0 deletions.
diff --git a/credstash.py b/credstash.py
@@ -94,6 +94,11 @@ def expand_wildcard(string, secrets):
 
 
 def value_or_filename(string):
+    # argparse running on old version of python (<2.7) will pass an empty
+    # string to this function before it passes the actual value.
+    # If an empty string is passes in, just return an empty string
+    if string == "":
+        return ""
     if string[0] == "@":
         filename = string[1:]
         try: