From 9e0408fc576ab7f50c523313c09d9ac800248c8c Mon Sep 17 00:00:00 2001
From: fibonacci1729 <brian@deis.com>
Date: Wed, 11 May 2016 14:58:59 -0600
Subject: [PATCH] fix(helm): fix for issue #680r

details: the host flag for install overrides the
TILLER_HOST env var. If neither are set,
host defaults to ":44134".
---
 cmd/helm/install.go | 20 +++++++++-----------
 glide.lock          |  6 ++++--
 glide.yaml          |  3 +++
 3 files changed, 16 insertions(+), 13 deletions(-)

diff --git a/cmd/helm/install.go b/cmd/helm/install.go
index 7ba4689b3..c98be823f 100644
--- a/cmd/helm/install.go
+++ b/cmd/helm/install.go
@@ -73,16 +73,14 @@ func printRelease(rel *release.Release) {
 }
 
 func setupInstallEnv() {
-	// note: TILLER_HOST envvar is
-	// acknowledged iff the host flag
-	// does not override the default.
-	//
-	// bug: except that if the host flag happens to set the host to the same
-	// value as the defaultHost, the env var will be used instead.
-	if tillerHost == defaultHost {
-		host := os.Getenv(hostEnvVar)
-		if host != "" {
-			tillerHost = host
+	// The 'host' flag takes precendence uber alles.
+	// If set, proceed with install using provided host
+	// address. If unset, the 'TILLER_HOST' environment
+	// variable (if set) is used, otherwise defaults to ":44134".
+	if tillerHost == "" {
+		tillerHost = os.Getenv(hostEnvVar)
+		if tillerHost == "" {
+			tillerHost = defaultHost
 		}
 	}
 
@@ -90,7 +88,7 @@ func setupInstallEnv() {
 }
 
 func init() {
-	installCmd.Flags().StringVar(&tillerHost, "host", defaultHost, "address of tiller server")
+	installCmd.Flags().StringVar(&tillerHost, "host", "", "address of tiller server (default \":44134\")")
 	installCmd.Flags().BoolVar(&installDryRun, "dry-run", false, "simulate an install")
 
 	RootCommand.AddCommand(installCmd)
diff --git a/glide.lock b/glide.lock
index 52380e0f9..a1c21a09d 100644
--- a/glide.lock
+++ b/glide.lock
@@ -1,5 +1,5 @@
-hash: 998d87445fec0bd715fa5ccbcc227cb4997e56ceff58dc8eb53ea2e0cc84abfd
-updated: 2016-04-27T16:11:47.531200165-06:00
+hash: 206ac8a0bde06c910b7100ca5de782dc96728e29693af6671cf5a52d1942b9c9
+updated: 2016-05-11T16:15:47.057456197-06:00
 imports:
 - name: bitbucket.org/ww/goautoneg
   version: 75cd24fc2f2c
@@ -352,4 +352,6 @@ imports:
   - pkg/controller/podautoscaler/metrics
 - name: speter.net/go/exp/math/dec/inf
   version: 42ca6cd68aa922bc3f32f1e056e61b65945d9ad7
+  repo: git@github.com:go-inf/inf.git
+  vcs: git
 devImports: []
diff --git a/glide.yaml b/glide.yaml
index 670332665..f232f34f9 100644
--- a/glide.yaml
+++ b/glide.yaml
@@ -30,3 +30,6 @@ import:
   - pkg/kubectl/cmd/util
   - pkg/kubectl/resource
 - package: github.com/gosuri/uitable
+- package: speter.net/go/exp/math/dec/inf
+  vcs: git
+  repo: git@github.com:go-inf/inf.git