From aec46961e9a1af4940f14ff621ea56c1c192ec0d Mon Sep 17 00:00:00 2001 From: zhangxiaoyu-zidif Date: Sat, 6 May 2017 19:06:27 +0800 Subject: [PATCH] nfs.go: cleancode err --- pkg/volume/nfs/nfs.go | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) diff --git a/pkg/volume/nfs/nfs.go b/pkg/volume/nfs/nfs.go index 323c14cd3e8..12ecd3aa9f6 100644 --- a/pkg/volume/nfs/nfs.go +++ b/pkg/volume/nfs/nfs.go @@ -195,19 +195,15 @@ func (nfsMounter *nfsMounter) CanMount() error { exe := exec.New() switch runtime.GOOS { case "linux": - _, err1 := exe.Command("/bin/ls", "/sbin/mount.nfs").CombinedOutput() - _, err2 := exe.Command("/bin/ls", "/sbin/mount.nfs4").CombinedOutput() - - if err1 != nil { + if _, err := exe.Command("/bin/ls", "/sbin/mount.nfs").CombinedOutput(); err != nil { return fmt.Errorf("Required binary /sbin/mount.nfs is missing") } - if err2 != nil { + if _, err := exe.Command("/bin/ls", "/sbin/mount.nfs4").CombinedOutput(); err != nil { return fmt.Errorf("Required binary /sbin/mount.nfs4 is missing") } return nil case "darwin": - _, err := exe.Command("/bin/ls", "/sbin/mount_nfs").CombinedOutput() - if err != nil { + if _, err := exe.Command("/bin/ls", "/sbin/mount_nfs").CombinedOutput(); err != nil { return fmt.Errorf("Required binary /sbin/mount_nfs is missing") } }