Pass argumements to NewFromCLI as varargs

Signed-off-by: Ian Campbell <ijc@docker.com>
This commit is contained in:
Ian Campbell 2017-10-06 17:41:19 +01:00
parent 7748b59d5d
commit a9b0c6f889
4 changed files with 4 additions and 4 deletions

View File

@ -21,7 +21,7 @@ func pkgBuild(args []string) {
force := flags.Bool("force", false, "Force rebuild") force := flags.Bool("force", false, "Force rebuild")
ps, err := pkglib.NewFromCLI(flags, args) ps, err := pkglib.NewFromCLI(flags, args...)
if err != nil { if err != nil {
fmt.Fprintf(os.Stderr, "%v\n", err) fmt.Fprintf(os.Stderr, "%v\n", err)
os.Exit(1) os.Exit(1)

View File

@ -21,7 +21,7 @@ func pkgPush(args []string) {
force := flags.Bool("force", false, "Force rebuild") force := flags.Bool("force", false, "Force rebuild")
ps, err := pkglib.NewFromCLI(flags, args) ps, err := pkglib.NewFromCLI(flags, args...)
if err != nil { if err != nil {
fmt.Fprintf(os.Stderr, "%v\n", err) fmt.Fprintf(os.Stderr, "%v\n", err)
os.Exit(1) os.Exit(1)

View File

@ -19,7 +19,7 @@ func pkgShowTag(args []string) {
flags.PrintDefaults() flags.PrintDefaults()
} }
ps, err := pkglib.NewFromCLI(flags, args) ps, err := pkglib.NewFromCLI(flags, args...)
if err != nil { if err != nil {
fmt.Fprintf(os.Stderr, "%v\n", err) fmt.Fprintf(os.Stderr, "%v\n", err)
os.Exit(1) os.Exit(1)

View File

@ -39,7 +39,7 @@ type Pkg struct {
} }
// NewFromCLI creates a Pkg from a set of CLI arguments. Calls fs.Parse() // NewFromCLI creates a Pkg from a set of CLI arguments. Calls fs.Parse()
func NewFromCLI(fs *flag.FlagSet, args []string) (Pkg, error) { func NewFromCLI(fs *flag.FlagSet, args ...string) (Pkg, error) {
// Defaults // Defaults
pi := pkgInfo{ pi := pkgInfo{
Org: "linuxkit", Org: "linuxkit",