Merge pull request #601 from q384566678/validate-linux-fix

liangchenye · web-flow · commit 36891b96b03f · 2018-03-14T10:21:14.000+08:00
Validate_linux: Modify the returned error
diff --git a/validate/validate_linux.go b/validate/validate_linux.go
@@ -180,7 +180,7 @@ func (v *Validator) CheckLinux() (errs error) {
 		}
 
 		if _, exists := devTypeList[devID]; exists {
-			logrus.Warnf("type:%s, major:%d and minor:%d for linux devices is duplicated", device.Type, device.Major, device.Minor)
+			logrus.Warnf("%v", specerror.NewError(specerror.DevicesErrorOnDup, fmt.Errorf("type:%s, major:%d and minor:%d for linux devices is duplicated", device.Type, device.Major, device.Minor), rspec.Version))
 		} else {
 			devTypeList[devID] = true
 		}

Original file line number	Diff line number	Diff line change
`@@ -180,7 +180,7 @@ func (v *Validator) CheckLinux() (errs error) {`
`180`	`180`	`}`
`181`	`181`
`182`	`182`	`if _, exists := devTypeList[devID]; exists {`
`183`		`- logrus.Warnf("type:%s, major:%d and minor:%d for linux devices is duplicated", device.Type, device.Major, device.Minor)`
	`183`	`+ logrus.Warnf("%v", specerror.NewError(specerror.DevicesErrorOnDup, fmt.Errorf("type:%s, major:%d and minor:%d for linux devices is duplicated", device.Type, device.Major, device.Minor), rspec.Version))`
`184`	`184`	`} else {`
`185`	`185`	`devTypeList[devID] = true`
`186`	`186`	`}`