deep-stack/kompose
7
0
Fork 0
forked from LaconicNetwork/kompose
Code Pull Requests Activity

Merge pull request #221 from cab105/master

Browse Source 
wrong global --bundle/--dab input #198
This commit is contained in:
sebgoa 2016-10-20 18:07:43 +02:00 committed by GitHub
commit 3e81215c98
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
cli/app/app.go
View File

@ -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")
}
}