v6: properly handle os.IsExist().

minetest-tools · Jan 3, 2019 · 8b7a764 · 8b7a764
1 parent 2d846f2
commit 8b7a764
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 6 deletions.
diff --git a/Makefile b/Makefile
@@ -11,7 +11,7 @@ DIST := \
 	mtmediasrv.conf
 
 PROJECT := mtmediasrv
-VERSION = 5
+VERSION = 6
 BUILD = `git describe --tags --always`
 
 $(PROJECT): main.go

diff --git a/main.go b/main.go
@@ -180,13 +180,12 @@ func collectMedia(l bool, c bool, e map[string]bool, w string) filepath.WalkFunc
 			if l {
 				err := os.Link(path, of)
 				if err != nil {
-					if err != os.ErrExist {
-						return err
+					if os.IsExist(err) {
+						return nil
 					}
+					return err
 				}
-				if err != os.ErrExist {
-					newmedia++
-				}
+				newmedia++
 			} else if c {
 				in, err := os.Open(path)
 				if err != nil {