File tree Expand file tree Collapse file tree 1 file changed +17
-1
lines changed Expand file tree Collapse file tree 1 file changed +17
-1
lines changed Original file line number Diff line number Diff line change @@ -8,6 +8,22 @@ import (
8
8
"strings"
9
9
)
10
10
11
+ var legacyDefaultImages = [... ]string {
12
+ defaultImage ,
13
+ "ubuntu-18.04" ,
14
+ "ubuntu-16.04" ,
15
+ "debian-9" ,
16
+ }
17
+
18
+ func isDefaultImageName (imageName string ) bool {
19
+ for _ , defaultImage := range legacyDefaultImages {
20
+ if imageName == defaultImage {
21
+ return true
22
+ }
23
+ }
24
+ return false
25
+ }
26
+
11
27
func (d * Driver ) setImageArch (arch string ) error {
12
28
switch arch {
13
29
case "" :
@@ -23,7 +39,7 @@ func (d *Driver) setImageArch(arch string) error {
23
39
}
24
40
25
41
func (d * Driver ) verifyImageFlags () error {
26
- if d .ImageID != 0 && d .Image != "" && d .Image != defaultImage /* support legacy behaviour */ {
42
+ if d .ImageID != 0 && d .Image != "" && ! isDefaultImageName ( d .Image ) /* support legacy behaviour */ {
27
43
return d .flagFailure ("--%v and --%v are mutually exclusive" , flagImage , flagImageID )
28
44
} else if d .ImageID != 0 && d .ImageArch != "" {
29
45
return d .flagFailure ("--%v and --%v are mutually exclusive" , flagImageArch , flagImageID )
You can’t perform that action at this time.
0 commit comments