Merge pull request #6958 from smarterclayton/args_remain_in_order

`kubectl get rc,pods` should invoke in that order

Merge pull request #6958 from smarterclayton/args_remain_in_order
4833578a · Clayton Coleman · 3bc42f16 · 2c118356 · 4833578a
Commit 4833578a authored Apr 17, 2015 by Clayton Coleman
Hide whitespace changes
Inline Side-by-side

Showing with 10 additions and 2 deletions

builder.go pkg/kubectl/resource/builder.go +10 -2

No files found.
--- a/pkg/kubectl/resource/builder.go
+++ b/pkg/kubectl/resource/builder.go
@@ -600,8 +600,16 @@ func (b *Builder) Do() *Result {
 	return r
 }
+// SplitResourceArgument splits the argument with commas and returns unique
+// strings in the original order.
 func SplitResourceArgument(arg string) []string {
+	out := []string{}
 	set := util.NewStringSet()
-	set.Insert(strings.Split(arg, ",")...)
+	for _, s := range strings.Split(arg, ",") {
-	return set.List()
+		if set.Has(s) {
+			continue
+		}
+		out = append(out, s)
+	}
+	return out
 }