From c8721785516ea3e795ca5f5bd0eaa97c07048a28 Mon Sep 17 00:00:00 2001
From: CF Buildpacks Team CI Server <cf-buildpacks-eng@pivotal.io>
Date: Wed, 16 Oct 2019 14:49:30 +0000
Subject: [PATCH] Update go module github.com/cloudfoundry/dagger

---
 go.mod                                        |  2 +-
 go.sum                                        |  4 ++--
 vendor/github.com/cloudfoundry/dagger/pack.go | 16 +++++++++-------
 vendor/modules.txt                            |  2 +-
 4 files changed, 13 insertions(+), 11 deletions(-)

diff --git a/go.mod b/go.mod
index 78fdd739..3fc163bc 100644
--- a/go.mod
+++ b/go.mod
@@ -5,7 +5,7 @@ go 1.12
 require (
 	github.com/Masterminds/semver v1.5.0
 	github.com/buildpack/libbuildpack v1.24.5
-	github.com/cloudfoundry/dagger v0.0.0-20191014145151-7f38f25964e1
+	github.com/cloudfoundry/dagger v0.0.0-20191016144449-e21676fc28c9
 	github.com/cloudfoundry/libcfbuildpack v1.89.0
 	github.com/golang/mock v1.3.1
 	github.com/onsi/gomega v1.7.0
diff --git a/go.sum b/go.sum
index abbe564a..e1519545 100644
--- a/go.sum
+++ b/go.sum
@@ -19,8 +19,8 @@ github.com/Masterminds/semver v1.5.0/go.mod h1:MB6lktGJrhw8PrUyiEoblNEGEQ+RzHPF0
 github.com/buildpack/libbuildpack v1.24.5 h1:r7AM7r8ff7ocI1KOopVHEC3EDTCdrj0YeTXkfYuqH0I=
 github.com/buildpack/libbuildpack v1.24.5/go.mod h1:cBmq8aozSDfy+RiKCERQbT6lk0M/Xf3aJWK2PLbPG1g=
 github.com/client9/misspell v0.3.4/go.mod h1:qj6jICC3Q7zFZvVWo7KLAzC3yx5G7kyvSDkc90ppPyw=
-github.com/cloudfoundry/dagger v0.0.0-20191014145151-7f38f25964e1 h1:E/1EGCXcp+oWHcV8MgQS0tg6HbotneCOo0YdlFEzC18=
-github.com/cloudfoundry/dagger v0.0.0-20191014145151-7f38f25964e1/go.mod h1:xqRl2xy0Q75hzZXM/Cv2DZNl7OIzaT/6JOy8TZbb4yk=
+github.com/cloudfoundry/dagger v0.0.0-20191016144449-e21676fc28c9 h1:KtPKzoWvDgHWeX5hyosWa9oY2qx+/oDaOMr8yCTkeJc=
+github.com/cloudfoundry/dagger v0.0.0-20191016144449-e21676fc28c9/go.mod h1:xqRl2xy0Q75hzZXM/Cv2DZNl7OIzaT/6JOy8TZbb4yk=
 github.com/cloudfoundry/libcfbuildpack v1.89.0 h1:A0OXihcHjvDRLYendhfqMxTBVe5pi5fmM5t4sqNRpao=
 github.com/cloudfoundry/libcfbuildpack v1.89.0/go.mod h1:ufhp/bp0LxbDDwbf2Ms3Bf4x9YnLr9dkL1RTUYSdKg0=
 github.com/cloudfoundry/packit v0.0.0-20191014140300-f8d2e0b20a04 h1:IKq64UyPDs+HD8dDE7fRHC+W/Vw2L0J+GfPuTiTTo50=
diff --git a/vendor/github.com/cloudfoundry/dagger/pack.go b/vendor/github.com/cloudfoundry/dagger/pack.go
index 0a603bec..ff54f6e1 100644
--- a/vendor/github.com/cloudfoundry/dagger/pack.go
+++ b/vendor/github.com/cloudfoundry/dagger/pack.go
@@ -154,7 +154,7 @@ func (p Pack) Build() (*App, error) {
 	}
 
 	keys := []string{}
-	for key, _ := range p.env {
+	for key := range p.env {
 		keys = append(keys, key)
 	}
 
@@ -178,19 +178,21 @@ func (p Pack) Build() (*App, error) {
 		packArgs = append(packArgs, "--network", "none", "--no-pull")
 	}
 
-	buildLogs, _, err := p.executable.Execute(packit.Execution{
-		Args: packArgs,
-		Dir:  p.dir,
+	buildLogs := bytes.NewBuffer(nil)
+	_, _, err := p.executable.Execute(packit.Execution{
+		Args:   packArgs,
+		Stdout: buildLogs,
+		Stderr: buildLogs,
+		Dir:    p.dir,
 	})
-
 	if err != nil {
-		return nil, errors.Wrap(err, buildLogs)
+		return nil, errors.Wrap(err, buildLogs.String())
 	}
 
 	sum := sha256.Sum256([]byte(fmt.Sprintf("index.docker.io/library/%s:latest", p.image))) //This is how pack makes cache image names
 	cacheImage := fmt.Sprintf("pack-cache-%x", sum[:6])
 
-	app := NewApp(p.dir, p.image, cacheImage, bytes.NewBufferString(buildLogs), make(map[string]string))
+	app := NewApp(p.dir, p.image, cacheImage, buildLogs, make(map[string]string))
 	return &app, nil
 }
 
diff --git a/vendor/modules.txt b/vendor/modules.txt
index 459c2de1..50cf6343 100644
--- a/vendor/modules.txt
+++ b/vendor/modules.txt
@@ -19,7 +19,7 @@ github.com/buildpack/libbuildpack/stack
 github.com/buildpack/libbuildpack/buildpackplan
 github.com/buildpack/libbuildpack/platform
 github.com/buildpack/libbuildpack/services
-# github.com/cloudfoundry/dagger v0.0.0-20191014145151-7f38f25964e1
+# github.com/cloudfoundry/dagger v0.0.0-20191016144449-e21676fc28c9
 github.com/cloudfoundry/dagger
 github.com/cloudfoundry/dagger/utils
 # github.com/cloudfoundry/libcfbuildpack v1.89.0