Merge pull request #8 from calavera/add_values_to_envmap

Fix issue reading file.
joho · Jan 2, 2015 · ead2e75 · ead2e75
2 parents a01a834 + dc9cc93
commit ead2e75
Showing 1 changed file with 4 additions and 2 deletions.
diff --git a/godotenv.go b/godotenv.go
@@ -104,7 +104,9 @@ func loadFile(filename string) (err error) {
 	}
 
 	for key, value := range envMap {
-		os.Setenv(key, value)
+		if os.Getenv(key) == "" {
+			os.Setenv(key, value)
+		}
 	}
 
 	return
@@ -129,7 +131,7 @@ func readFile(filename string) (envMap map[string]string, err error) {
 		if !isIgnoredLine(fullLine) {
 			key, value, err := parseLine(fullLine)
 
-			if err == nil && os.Getenv(key) == "" {
+			if err == nil {
 				envMap[key] = value
 			}
 		}