Merge pull request #1185 from sdboyer/improve-GOPATH-err

sdboyer · web-flow · commit 5e004f483e16 · 2017-09-19T19:39:35.000-04:00
ctx: improve "not under GOPATH" errors
diff --git a/context.go b/context.go
@@ -223,7 +223,7 @@ func (c *Ctx) detectGOPATH(path string) (string, error) {
 			return gp, nil
 		}
 	}
-	return "", errors.Errorf("%s is not within a known GOPATH", path)
+	return "", errors.Errorf("%s is not within a known GOPATH/src", path)
 }
 
 // ImportForAbs returns the import path for an absolute project path by trimming the
@@ -244,7 +244,7 @@ func (c *Ctx) ImportForAbs(path string) (string, error) {
 		return filepath.ToSlash(path[len(srcprefix):]), nil
 	}
 
-	return "", errors.Errorf("%s not in GOPATH", path)
+	return "", errors.Errorf("%s is not within any GOPATH/src", path)
 }
 
 // AbsForImport returns the absolute path for the project root

Original file line number	Diff line number	Diff line change
`@@ -223,7 +223,7 @@ func (c *Ctx) detectGOPATH(path string) (string, error) {`
`223`	`223`	`return gp, nil`
`224`	`224`	`}`
`225`	`225`	`}`
`226`		`- return "", errors.Errorf("%s is not within a known GOPATH", path)`
	`226`	`+ return "", errors.Errorf("%s is not within a known GOPATH/src", path)`
`227`	`227`	`}`
`228`	`228`
`229`	`229`	`// ImportForAbs returns the import path for an absolute project path by trimming the`
`@@ -244,7 +244,7 @@ func (c *Ctx) ImportForAbs(path string) (string, error) {`
`244`	`244`	`return filepath.ToSlash(path[len(srcprefix):]), nil`
`245`	`245`	`}`
`246`	`246`
`247`		`- return "", errors.Errorf("%s not in GOPATH", path)`
	`247`	`+ return "", errors.Errorf("%s is not within any GOPATH/src", path)`
`248`	`248`	`}`
`249`	`249`
`250`	`250`	`// AbsForImport returns the absolute path for the project root`