Merge pull request #221 from cab105/master

wrong global --bundle/--dab input #198
2016-10-20 18:07:43 +02:00
parent b97760a537 d3142c7435
commit 3e81215c98
1 changed files with 1 additions and 1 deletions
@@ -71,7 +71,7 @@ func validateFlags(c *cli.Context, opt *kobject.ConvertOptions) {
 		opt.InputFile = dabFile
 	}

-	if len(dabFile) > 0 && len(opt.InputFile) > 0 && opt.InputFile != DefaultComposeFile {
+	if len(dabFile) > 0 && c.GlobalIsSet("file") {
 		logrus.Fatalf("Error: 'compose' file and 'dab' file cannot be specified at the same time")
 	}
 }