Merge pull request #139 from hmeng-19/remove_extra_else

Mrunal Patel · web-flow · commit cc7b4cb1d6e0 · 2016-07-21T14:58:01.000-07:00
remove extra else
diff --git a/cmd/ocitools/validate.go b/cmd/ocitools/validate.go
@@ -109,10 +109,9 @@ var bundleValidateCommand = cli.Command{
 			errMsg = fmt.Sprintf("%d Errors detected:\n%s", i-1, errMsg)
 			return errors.New(errMsg)
 
-		} else {
-			fmt.Println("Bundle validation succeeded.")
-			return nil
 		}
+		fmt.Println("Bundle validation succeeded.")
+		return nil
 	},
 }
 
@@ -270,10 +269,9 @@ func supportedMountTypes(OS string, hostCheck bool) (map[string]bool, error) {
 		supportedTypes["bind"] = true
 
 		return supportedTypes, nil
-	} else {
-		logrus.Warn("Checking linux mount types without --host-specific is not supported yet")
-		return nil, nil
 	}
+	logrus.Warn("Checking linux mount types without --host-specific is not supported yet")
+	return nil, nil
 }
 
 func checkMounts(spec rspec.Spec, rootfs string, hostCheck bool) (msgs []string) {

Original file line number	Diff line number	Diff line change
`@@ -109,10 +109,9 @@ var bundleValidateCommand = cli.Command{`
`109`	`109`	`errMsg = fmt.Sprintf("%d Errors detected:\n%s", i-1, errMsg)`
`110`	`110`	`return errors.New(errMsg)`
`111`	`111`
`112`		`- } else {`
`113`		`- fmt.Println("Bundle validation succeeded.")`
`114`		`- return nil`
`115`	`112`	`}`
	`113`	`+ fmt.Println("Bundle validation succeeded.")`
	`114`	`+ return nil`
`116`	`115`	`},`
`117`	`116`	`}`
`118`	`117`
`@@ -270,10 +269,9 @@ func supportedMountTypes(OS string, hostCheck bool) (map[string]bool, error) {`
`270`	`269`	`supportedTypes["bind"] = true`
`271`	`270`
`272`	`271`	`return supportedTypes, nil`
`273`		`- } else {`
`274`		`- logrus.Warn("Checking linux mount types without --host-specific is not supported yet")`
`275`		`- return nil, nil`
`276`	`272`	`}`
	`273`	`+ logrus.Warn("Checking linux mount types without --host-specific is not supported yet")`
	`274`	`+ return nil, nil`
`277`	`275`	`}`
`278`	`276`
`279`	`277`	`func checkMounts(spec rspec.Spec, rootfs string, hostCheck bool) (msgs []string) {`