From 6a6a2ad8a4af85b543a24c5d22a2be5fdfc252d6 Mon Sep 17 00:00:00 2001
From: "Guillaume J. Charmes" <guillaume.charmes@dotcloud.com>
Date: Wed, 7 Aug 2013 17:23:49 -0700
Subject: [PATCH] Make sure ENV instruction within build perform a commit each
 time

---
 buildfile.go | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/buildfile.go b/buildfile.go
index 3c4229d8bf..b969f758ec 100644
--- a/buildfile.go
+++ b/buildfile.go
@@ -172,9 +172,9 @@ func (b *buildFile) CmdEnv(args string) error {
 
 	if envKey >= 0 {
 		b.config.Env[envKey] = replacedVar
-		return nil
+	} else {
+		b.config.Env = append(b.config.Env, replacedVar)
 	}
-	b.config.Env = append(b.config.Env, replacedVar)
 	return b.commit("", b.config.Cmd, fmt.Sprintf("ENV %s", replacedVar))
 }