From 814b8a3a21adabfed6ce64ef2cd07a03b88119d9 Mon Sep 17 00:00:00 2001
From: Fabiano Franz <ffranz@redhat.com>
Date: Wed, 25 Nov 2015 12:48:23 -0200
Subject: [PATCH] Bump spf13/pflag

---
 Godeps/Godeps.json                                        | 2 +-
 Godeps/_workspace/src/github.com/spf13/pflag/.travis.yml  | 1 +
 .../_workspace/src/github.com/spf13/pflag/string_slice.go | 8 +++++++-
 3 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/Godeps/Godeps.json b/Godeps/Godeps.json
index 9b2c746bb2a..e96634648e2 100644
--- a/Godeps/Godeps.json
+++ b/Godeps/Godeps.json
@@ -686,7 +686,7 @@
 		},
 		{
 			"ImportPath": "github.com/spf13/pflag",
-			"Rev": "b084184666e02084b8ccb9b704bf0d79c466eb1d"
+			"Rev": "08b1a584251b5b62f458943640fc8ebd4d50aaa5"
 		},
 		{
 			"ImportPath": "github.com/stretchr/objx",
diff --git a/Godeps/_workspace/src/github.com/spf13/pflag/.travis.yml b/Godeps/_workspace/src/github.com/spf13/pflag/.travis.yml
index c40fb69818b..df435a03fd9 100644
--- a/Godeps/_workspace/src/github.com/spf13/pflag/.travis.yml
+++ b/Godeps/_workspace/src/github.com/spf13/pflag/.travis.yml
@@ -5,6 +5,7 @@ language: go
 go:
         - 1.3
         - 1.4
+        - 1.5
         - tip
 
 install:
diff --git a/Godeps/_workspace/src/github.com/spf13/pflag/string_slice.go b/Godeps/_workspace/src/github.com/spf13/pflag/string_slice.go
index 0b7ddfe3d6f..b53648b2e52 100644
--- a/Godeps/_workspace/src/github.com/spf13/pflag/string_slice.go
+++ b/Godeps/_workspace/src/github.com/spf13/pflag/string_slice.go
@@ -1,6 +1,7 @@
 package pflag
 
 import (
+	"encoding/csv"
 	"fmt"
 	"strings"
 )
@@ -21,7 +22,12 @@ func newStringSliceValue(val []string, p *[]string) *stringSliceValue {
 }
 
 func (s *stringSliceValue) Set(val string) error {
-	v := strings.Split(val, ",")
+	stringReader := strings.NewReader(val)
+	csvReader := csv.NewReader(stringReader)
+	v, err := csvReader.Read()
+	if err != nil {
+		return err
+	}
 	if !s.changed {
 		*s.value = v
 	} else {