Use evaluated project root path

context.go

@@ -5,6 +5,7 @@
 package dep
 
 import (
+	"fmt"
 	"log"
 	"os"
 	"path/filepath"
@@ -222,18 +223,29 @@ func (c *Ctx) detectGOPATH(path string) (string, error) {
 // ImportForAbs returns the import path for an absolute project path by trimming the
 // `$GOPATH/src/` prefix.  Returns an error for paths equal to, or without this prefix.
 func (c *Ctx) ImportForAbs(path string) (string, error) {
-	srcprefix := filepath.Join(c.GOPATH, "src") + string(filepath.Separator)
-	if fs.HasFilepathPrefix(path, srcprefix) {
-		if len(path) <= len(srcprefix) {
+
+	gopathEvaluated, err := filepath.EvalSymlinks(c.GOPATH)
+	if err != nil {
+		return "", fmt.Errorf("Error evaluating symlinks in GOPATH %s: %s", c.GOPATH, err.Error())
+	}
+
+	pathEvaluated, err := filepath.EvalSymlinks(path)
+	if err != nil {
+		return "", fmt.Errorf("Error evaluating symlinks in %s: %s", path, err.Error())
+	}
+
+	srcprefix := filepath.Join(gopathEvaluated, "src") + string(filepath.Separator)
+	if fs.HasFilepathPrefix(pathEvaluated, srcprefix) {
+		if len(pathEvaluated) <= len(srcprefix) {
 			return "", errors.New("dep does not currently support using GOPATH/src as the project root")
 		}
 
 		// filepath.ToSlash because we're dealing with an import path now,
 		// not an fs path
-		return filepath.ToSlash(path[len(srcprefix):]), nil
+		return filepath.ToSlash(pathEvaluated[len(srcprefix):]), nil
 	}
 
-	return "", errors.Errorf("%s not in GOPATH", path)
+	return "", errors.Errorf("%s not in GOPATH", pathEvaluated)
 }
 
 // absoluteProjectRoot determines the absolute path to the project root