From dc9cc93c4e85bf0e83c21f201a2d07d8804df25f Mon Sep 17 00:00:00 2001
From: David Calavera <david.calavera@gmail.com>
Date: Tue, 23 Dec 2014 17:57:02 -0800
Subject: [PATCH] Add values to the envMap when reading the file.

But do not override values in the global environment.
---
 godotenv.go | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/godotenv.go b/godotenv.go
index 816e759..33bf84d 100644
--- 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
 			}
 		}