netbird/easyjson
0
0
Fork 0
mirror of https://github.com/netbirdio/easyjson.git synced 2026-05-22 18:44:42 -07:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #263 from zifter/master

Browse Source 
Windows only issue - mismatch in volume letter
This commit is contained in:
GoWebProd
2020-03-30 23:09:22 +03:00
committed by GitHub
parent 5212bfcbf8 1c38a191ce
commit 38878c99bb
1 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
parser/pkgpath.go
+3 -2
View File
@@ -130,7 +130,8 @@ func getPkgPathFromGOPATH(fname string, isDir bool) (string, error) {
for _, p := range strings.Split(gopath, string(filepath.ListSeparator)) {
prefix := filepath.Join(p, "src") + string(filepath.Separator)
if rel := strings.TrimPrefix(fname, prefix); rel != fname {
rel, err := filepath.Rel(prefix, fname)
if err == nil && !strings.HasPrefix(rel, ".."+string(filepath.Separator)) {
if !isDir {
return path.Dir(filePathToPackagePath(rel)), nil
} else {
@@ -139,7 +140,7 @@ func getPkgPathFromGOPATH(fname string, isDir bool) (string, error) {
}
}
return "", fmt.Errorf("file '%v' is not in GOPATH", fname)
return "", fmt.Errorf("file '%v' is not in GOPATH '%v'", fname, gopath)
}
func filePathToPackagePath(path string) string {