From dd465ebfef51503afcc4c3c2066887ad97e857c2 Mon Sep 17 00:00:00 2001
From: Carlos Salguero <carlos.salguero@percona.com>
Date: Wed, 1 Feb 2017 01:27:54 -0300
Subject: [PATCH 1/2] Fixed build script

---
 util/build-packages | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/util/build-packages b/util/build-packages
index 08210ebe..b928a4bf 100755
--- a/util/build-packages
+++ b/util/build-packages
@@ -49,7 +49,7 @@ warn() {
 }
 
 cwd=$PWD
-PERCONA_TOOLKIT_BRANCH=${PERCONA_TOOLKIT_BRANCH:-""}
+PERCONA_TOOLKIT_BRANCH=$(git rev-parse --show-toplevel)
 if [ -n "$PERCONA_TOOLKIT_BRANCH" ]; then
    BRANCH=$PERCONA_TOOLKIT_BRANCH
    cd $BRANCH
@@ -438,7 +438,8 @@ build_go_binaries() {
    then
        echo "not in gopath"
        if [ -e ${TOOLKIT_DIR} ]; then
-           die "Cannot link current directory into GOPATH. Already exists"
+           echo "Cannot link current directory into GOPATH. Already exists" >&2
+           die "Please check/remove the ${TOOLKIT_DIR} directory"
        else
            mkdir -p ${PERCONA_DIR}
            ln -s ${BASE_DIR} ${PERCONA_DIR}
@@ -448,7 +449,7 @@ build_go_binaries() {
    echo "Building Go tools for $OS_ARCH ..."
    go get -u github.com/kardianos/govendor
    cd $GO_TOOLS_DIR
-   govendor fetch
+   govendor fetch +external
    make $OS_ARCH
    cd $CUR_DIR
 

From df45f9182d389a7d0e07df6a9a594d175624953c Mon Sep 17 00:00:00 2001
From: Carlos Salguero <carlos.salguero@percona.com>
Date: Wed, 1 Feb 2017 01:31:19 -0300
Subject: [PATCH 2/2] Updated vendored dependencies for Go

---
 src/go/vendor/vendor.json | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/go/vendor/vendor.json b/src/go/vendor/vendor.json
index 95f1d6a2..82f9b049 100644
--- a/src/go/vendor/vendor.json
+++ b/src/go/vendor/vendor.json
@@ -63,16 +63,16 @@
 			"revisionTime": "2017-01-12T20:04:14Z"
 		},
 		{
-			"checksumSHA1": "axnMKgQSC3quhKN7hhnJzmUucGw=",
+			"checksumSHA1": "hbVBehxpieRKCCXrrO3greA8eow=",
 			"path": "github.com/percona/pmgo",
-			"revision": "42879d6c2113a7df48dcfa8b2e37651e639810e2",
-			"revisionTime": "2016-12-06T18:44:57Z"
+			"revision": "20a7d7de024f754b59b6d51e8e3c21cf830299aa",
+			"revisionTime": "2017-02-01T04:03:13Z"
 		},
 		{
 			"checksumSHA1": "kTY8RZr5j26RNIR+F2SnMLeB7G8=",
 			"path": "github.com/percona/pmgo/pmgomock",
-			"revision": "42879d6c2113a7df48dcfa8b2e37651e639810e2",
-			"revisionTime": "2016-12-06T18:44:57Z"
+			"revision": "20a7d7de024f754b59b6d51e8e3c21cf830299aa",
+			"revisionTime": "2017-02-01T04:03:13Z"
 		},
 		{
 			"path": "github.com/percona/toolkit-go-old/pt-mongodb-summary/test",