filepath.Rel may fail. Sticking on absolute path comparison

Federico Fissore · Federico Fissore · commit 60b69afc7815 · 2015-09-15T16:42:57.000+02:00
Signed-off-by: Federico Fissore &lt;f.fissore@arduino.cc&gt;
diff --git a/src/arduino.cc/builder/fail_if_buildpath_equals_sketchpath.go b/src/arduino.cc/builder/fail_if_buildpath_equals_sketchpath.go
@@ -53,12 +53,7 @@ func (s *FailIfBuildpathEqualsSketchPath) Run(context map[string]interface{}) er
 	}
 	sketchPath = filepath.Dir(sketchPath)
 
-	rel, err := filepath.Rel(buildPath, sketchPath)
-	if err != nil {
-		return utils.WrapError(err)
-	}
-
-	if rel == "." {
+	if buildPath == sketchPath {
 		return utils.Errorf(context, "Sketch cannot be located in build path. Please specify a different build path")
 	}
 

Original file line number	Diff line number	Diff line change
`@@ -53,12 +53,7 @@ func (s *FailIfBuildpathEqualsSketchPath) Run(context map[string]interface{}) er`
`53`	`53`	`}`
`54`	`54`	`sketchPath = filepath.Dir(sketchPath)`
`55`	`55`
`56`		`- rel, err := filepath.Rel(buildPath, sketchPath)`
`57`		`- if err != nil {`
`58`		`- return utils.WrapError(err)`
`59`		`- }`
`60`		`-`
`61`		`- if rel == "." {`
	`56`	`+ if buildPath == sketchPath {`
`62`	`57`	`return utils.Errorf(context, "Sketch cannot be located in build path. Please specify a different build path")`
`63`	`58`	`}`
`64`	`59`