1. origin
  2. Commit 3a9bd3e4ace2c7370fc37d661bcc3e79237c9cc6
Browse code

Merge pull request #12367 from shiywang/minor_change

Merged by openshift-bot

OpenShift Bot authored on 2017/01/05 00:55:31
Showing 13 changed files
pkg/cmd/admin/policy/who_can.go
History View file @ 3a9bd3e
... ... 
@@ -50,8 +50,7 @@ func NewCmdWhoCan(name, fullName string, f *clientcmd.Factory, out io.Writer) *c
50 50 
 			options.bindingNamespace, _, err = f.DefaultNamespace()
51 51 
 			kcmdutil.CheckErr(err)
52 52
53 
-			err = options.run()
54 
-			kcmdutil.CheckErr(err)
53 
+			kcmdutil.CheckErr(options.run())
55 54 
 		},
56 55 
 	}
57 56
pkg/cmd/cli/cmd/dockerbuild/dockerbuild.go
History View file @ 3a9bd3e
... ... 
@@ -73,7 +73,7 @@ func NewCmdDockerbuild(fullName string, f *clientcmd.Factory, out, errOut io.Wri
73 73 
 			kcmdutil.CheckErr(options.Complete(f, cmd, args))
74 74 
 			kcmdutil.CheckErr(options.Validate())
75 75 
 			if err := options.Run(); err != nil {
76 
-				// TODO: move met to kcmdutil
76 
+				// TODO: move me to kcmdutil
77 77 
 				if err == cmdutil.ErrExit {
78 78 
 					os.Exit(1)
79 79 
 				}
pkg/cmd/cli/cmd/example.go
History View file @ 3a9bd3e
... ... 
@@ -45,7 +45,7 @@ func NewCmdTYPE(fullName string, f *clientcmd.Factory, in io.Reader, out, errout
45 45 
 			kcmdutil.CheckErr(options.Complete(f, cmd, args))
46 46 
 			kcmdutil.CheckErr(options.Validate())
47 47 
 			if err := options.Run(); err != nil {
48 
-				// TODO: move met to kcmdutil
48 
+				// TODO: move me to kcmdutil
49 49 
 				if err == cmdutil.ErrExit {
50 50 
 					os.Exit(1)
51 51 
 				}
pkg/cmd/cli/cmd/extract.go
History View file @ 3a9bd3e
... ... 
@@ -69,6 +69,7 @@ func NewCmdExtract(fullName string, f *clientcmd.Factory, in io.Reader, out, err
69 69 
 		Run: func(cmd *cobra.Command, args []string) {
70 70 
 			kcmdutil.CheckErr(options.Complete(f, in, out, cmd, args))
71 71 
 			kcmdutil.CheckErr(options.Validate())
72 
+			// TODO: move me to kcmdutil
72 73 
 			err := options.Run()
73 74 
 			if err == cmdutil.ErrExit {
74 75 
 				os.Exit(1)
pkg/cmd/cli/cmd/importer/appjson.go
History View file @ 3a9bd3e
... ... 
@@ -91,7 +91,7 @@ func NewCmdAppJSON(fullName string, f *clientcmd.Factory, in io.Reader, out, err
91 91 
 			kcmdutil.CheckErr(options.Complete(f, cmd, args))
92 92 
 			kcmdutil.CheckErr(options.Validate())
93 93 
 			if err := options.Run(); err != nil {
94 
-				// TODO: move met to kcmdutil
94 
+				// TODO: move me to kcmdutil
95 95 
 				if err == cmdutil.ErrExit {
96 96 
 					os.Exit(1)
97 97 
 				}
pkg/cmd/cli/cmd/importer/dockercompose.go
History View file @ 3a9bd3e
... ... 
@@ -84,7 +84,7 @@ func NewCmdDockerCompose(fullName string, f *clientcmd.Factory, in io.Reader, ou
84 84 
 			kcmdutil.CheckErr(options.Complete(f, cmd, args))
85 85 
 			kcmdutil.CheckErr(options.Validate())
86 86 
 			if err := options.Run(); err != nil {
87 
-				// TODO: move met to kcmdutil
87 
+				// TODO: move me to kcmdutil
88 88 
 				if err == cmdutil.ErrExit {
89 89 
 					os.Exit(1)
90 90 
 				}
pkg/cmd/cli/cmd/set/buildhook.go
History View file @ 3a9bd3e
... ... 
@@ -92,7 +92,7 @@ func NewCmdBuildHook(fullName string, f *clientcmd.Factory, out, errOut io.Write
92 92 
 			kcmdutil.CheckErr(options.Complete(f, cmd, args))
93 93 
 			kcmdutil.CheckErr(options.Validate())
94 94 
 			if err := options.Run(); err != nil {
95 
-				// TODO: move met to kcmdutil
95 
+				// TODO: move me to kcmdutil
96 96 
 				if err == cmdutil.ErrExit {
97 97 
 					os.Exit(1)
98 98 
 				}
pkg/cmd/cli/cmd/set/probe.go
History View file @ 3a9bd3e
... ... 
@@ -127,7 +127,7 @@ func NewCmdProbe(fullName string, f *clientcmd.Factory, out, errOut io.Writer) *
127 127 
 			kcmdutil.CheckErr(options.Complete(f, cmd, args))
128 128 
 			kcmdutil.CheckErr(options.Validate())
129 129 
 			if err := options.Run(); err != nil {
130 
-				// TODO: move met to kcmdutil
130 
+				// TODO: move me to kcmdutil
131 131 
 				if err == cmdutil.ErrExit {
132 132 
 					os.Exit(1)
133 133 
 				}
pkg/cmd/cli/cmd/set/routebackends.go
History View file @ 3a9bd3e
... ... 
@@ -108,6 +108,7 @@ func NewCmdRouteBackends(fullName string, f *clientcmd.Factory, out, errOut io.W
108 108 
 			kcmdutil.CheckErr(options.Complete(f, cmd, args))
109 109 
 			kcmdutil.CheckErr(options.Validate())
110 110 
 			err := options.Run()
111 
+			// TODO: move me to kcmdutil
111 112 
 			if err == cmdutil.ErrExit {
112 113 
 				os.Exit(1)
113 114 
 			}
pkg/cmd/cli/cmd/set/triggers.go
History View file @ 3a9bd3e
... ... 
@@ -119,7 +119,7 @@ func NewCmdTriggers(fullName string, f *clientcmd.Factory, out, errOut io.Writer
119 119 
 			kcmdutil.CheckErr(options.Complete(f, cmd, args))
120 120 
 			kcmdutil.CheckErr(options.Validate())
121 121 
 			if err := options.Run(); err != nil {
122 
-				// TODO: move met to kcmdutil
122 
+				// TODO: move me to kcmdutil
123 123 
 				if err == cmdutil.ErrExit {
124 124 
 					os.Exit(1)
125 125 
 				}
pkg/cmd/cli/sa/gettoken.go
History View file @ 3a9bd3e
... ... 
@@ -63,9 +63,7 @@ func NewCommandGetServiceAccountToken(name, fullname string, f *clientcmd.Factor
63 63 
 		Example: fmt.Sprintf(getServiceAccountTokenExamples, fullname),
64 64 
 		Run: func(cmd *cobra.Command, args []string) {
65 65 
 			cmdutil.CheckErr(options.Complete(args, f, cmd))
66 
-
67 66 
 			cmdutil.CheckErr(options.Validate())
68 
-
69 67 
 			cmdutil.CheckErr(options.Run())
70 68 
 		},
71 69 
 	}
pkg/cmd/cli/sa/newtoken.go
History View file @ 3a9bd3e
... ... 
@@ -79,9 +79,7 @@ func NewCommandNewServiceAccountToken(name, fullname string, f *clientcmd.Factor
79 79 
 		Example: fmt.Sprintf(newServiceAccountTokenExamples, fullname),
80 80 
 		Run: func(cmd *cobra.Command, args []string) {
81 81 
 			cmdutil.CheckErr(options.Complete(args, requestedLabels, f, cmd))
82 
-
83 82 
 			cmdutil.CheckErr(options.Validate())
84 
-
85 83 
 			cmdutil.CheckErr(options.Run())
86 84 
 		},
87 85 
 	}
pkg/cmd/experimental/buildchain/buildchain.go
History View file @ 3a9bd3e
... ... 
@@ -71,9 +71,7 @@ func NewCmdBuildChain(name, fullName string, f *clientcmd.Factory, out io.Writer
71 71 
 		Example: fmt.Sprintf(buildChainExample, fullName),
72 72 
 		Run: func(cmd *cobra.Command, args []string) {
73 73 
 			cmdutil.CheckErr(options.Complete(f, cmd, args, out))
74 
-
75 74 
 			cmdutil.CheckErr(options.Validate())
76 
-
77 75 
 			cmdutil.CheckErr(options.RunBuildChain())
78 76 
 		},
79 77 
 	}