From ba6a709062496290658582a81ea2f61a9848d2b3 Mon Sep 17 00:00:00 2001
From: Tom Denham <tom@tomdee.co.uk>
Date: Wed, 5 Jul 2017 11:46:00 -0700
Subject: [PATCH] Update vendor to v0.6.0-rc1

---
 Godeps/Godeps.json                            | 28 +++++++++----------
 .../containernetworking/cni/pkg/types/args.go | 15 ++++++++--
 2 files changed, 27 insertions(+), 16 deletions(-)

diff --git a/Godeps/Godeps.json b/Godeps/Godeps.json
index 898ea170..bcc07be2 100644
--- a/Godeps/Godeps.json
+++ b/Godeps/Godeps.json
@@ -8,38 +8,38 @@
 	"Deps": [
 		{
 			"ImportPath": "github.com/containernetworking/cni/libcni",
-			"Comment": "v0.5.2-git49d814c",
-			"Rev": "49d814cf37bfea351a1caedd0c66825c9d6fca52"
+			"Comment": "v0.6.0-rc1",
+			"Rev": "a2da8f8d7fd8e6dc25f336408a8ac86f050fbd88"
 		},
 		{
 			"ImportPath": "github.com/containernetworking/cni/pkg/invoke",
-			"Comment": "v0.5.2-git49d814c",
-			"Rev": "49d814cf37bfea351a1caedd0c66825c9d6fca52"
+			"Comment": "v0.6.0-rc1",
+			"Rev": "a2da8f8d7fd8e6dc25f336408a8ac86f050fbd88"
 		},
 		{
 			"ImportPath": "github.com/containernetworking/cni/pkg/skel",
-			"Comment": "v0.5.2-git49d814c",
-			"Rev": "49d814cf37bfea351a1caedd0c66825c9d6fca52"
+			"Comment": "v0.6.0-rc1",
+			"Rev": "a2da8f8d7fd8e6dc25f336408a8ac86f050fbd88"
 		},
 		{
 			"ImportPath": "github.com/containernetworking/cni/pkg/types",
-			"Comment": "v0.5.2-git49d814c",
-			"Rev": "49d814cf37bfea351a1caedd0c66825c9d6fca52"
+			"Comment": "v0.6.0-rc1",
+			"Rev": "a2da8f8d7fd8e6dc25f336408a8ac86f050fbd88"
 		},
 		{
 			"ImportPath": "github.com/containernetworking/cni/pkg/types/020",
-			"Comment": "v0.5.2-git49d814c",
-			"Rev": "49d814cf37bfea351a1caedd0c66825c9d6fca52"
+			"Comment": "v0.6.0-rc1",
+			"Rev": "a2da8f8d7fd8e6dc25f336408a8ac86f050fbd88"
 		},
 		{
 			"ImportPath": "github.com/containernetworking/cni/pkg/types/current",
-			"Comment": "v0.5.2-git49d814c",
-			"Rev": "49d814cf37bfea351a1caedd0c66825c9d6fca52"
+			"Comment": "v0.6.0-rc1",
+			"Rev": "a2da8f8d7fd8e6dc25f336408a8ac86f050fbd88"
 		},
 		{
 			"ImportPath": "github.com/containernetworking/cni/pkg/version",
-			"Comment": "v0.5.2-git49d814c",
-			"Rev": "49d814cf37bfea351a1caedd0c66825c9d6fca52"
+			"Comment": "v0.6.0-rc1",
+			"Rev": "a2da8f8d7fd8e6dc25f336408a8ac86f050fbd88"
 		},
 		{
 			"ImportPath": "github.com/coreos/go-iptables/iptables",
diff --git a/vendor/github.com/containernetworking/cni/pkg/types/args.go b/vendor/github.com/containernetworking/cni/pkg/types/args.go
index 66dcf9ea..bd8640fc 100644
--- a/vendor/github.com/containernetworking/cni/pkg/types/args.go
+++ b/vendor/github.com/containernetworking/cni/pkg/types/args.go
@@ -63,6 +63,12 @@ func GetKeyField(keyString string, v reflect.Value) reflect.Value {
 	return v.Elem().FieldByName(keyString)
 }
 
+// UnmarshalableArgsError is used to indicate error unmarshalling args
+// from the args-string in the form "K=V;K2=V2;..."
+type UnmarshalableArgsError struct {
+	error
+}
+
 // LoadArgs parses args from a string in the form "K=V;K2=V2;..."
 func LoadArgs(args string, container interface{}) error {
 	if args == "" {
@@ -85,8 +91,13 @@ func LoadArgs(args string, container interface{}) error {
 			unknownArgs = append(unknownArgs, pair)
 			continue
 		}
-
-		u := keyField.Addr().Interface().(encoding.TextUnmarshaler)
+		keyFieldIface := keyField.Addr().Interface()
+		u, ok := keyFieldIface.(encoding.TextUnmarshaler)
+		if !ok {
+			return UnmarshalableArgsError{fmt.Errorf(
+				"ARGS: cannot unmarshal into field '%s' - type '%s' does not implement encoding.TextUnmarshaler",
+				keyString, reflect.TypeOf(keyFieldIface))}
+		}
 		err := u.UnmarshalText([]byte(valueString))
 		if err != nil {
 			return fmt.Errorf("ARGS: error parsing value of pair %q: %v)", pair, err)