From 7f4a5ac413f1a35b2249e74ffcfa4434599af1a3 Mon Sep 17 00:00:00 2001
From: Joshua Seidel <joshua.seidel@blackboard.com>
Date: Wed, 8 Jul 2015 15:09:17 -0400
Subject: [PATCH] fix if statement and condition

---
 builtin/provisioners/chef/resource_provisioner.go | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/builtin/provisioners/chef/resource_provisioner.go b/builtin/provisioners/chef/resource_provisioner.go
index 2708ee0421..769c0e3378 100644
--- a/builtin/provisioners/chef/resource_provisioner.go
+++ b/builtin/provisioners/chef/resource_provisioner.go
@@ -348,7 +348,7 @@ func (p *Provisioner) deployConfigFiles(
 		return fmt.Errorf("Uploading %s failed: %v", validationKey, err)
 	}
 
-	if p.SecretKeyPath != nil
+	if p.SecretKeyPath != ""
 	{
         // Open the secret key file
         f, err := os.Open(p.SecretKeyPath)
@@ -361,6 +361,7 @@ func (p *Provisioner) deployConfigFiles(
         if err := comm.Upload(path.Join(confDir, secretKey), f); err != nil {
                 return fmt.Errorf("Uploading %s failed: %v", secretKey, err)
         }
+	return
 	}
 
 	// Make strings.Join available for use within the template