This commit is contained in:
Brian Starke 2017-02-15 21:33:24 -05:00
Родитель 76cfb0516a
Коммит 6c8491c792
2 изменённых файлов: 4 добавлений и 6 удалений

Просмотреть файл

@ -27,7 +27,6 @@ func NewContext() (*Ctx, error) {
// this way we get the default GOPATH that was added in 1.8
buildContext := build.Default
wd, err := os.Getwd()
if err != nil {
return nil, errors.Wrap(err, "getting work directory")
}
@ -125,11 +124,11 @@ func (c *Ctx) LoadProject(path string) (*Project, error) {
//
// The second returned string indicates which GOPATH value was used.
func (c *Ctx) SplitAbsoluteProjectRoot(path string) (string, error) {
// the path may lie within a symlinked directory, resolve that first
// the path may lie within a symlinked directory, resolve those first
path, err := filepath.EvalSymlinks(path)
if err != nil {
return "", fmt.Errorf("failed to resolve symlinks: %s", err)
return "", fmt.Errorf("failed attempt to resolve symlinks: %s", err)
}
srcprefix := filepath.Join(c.GOPATH, "src") + string(filepath.Separator)

Просмотреть файл

@ -5,7 +5,6 @@
package dep
import (
"fmt"
"os"
"path/filepath"
"testing"
@ -46,8 +45,8 @@ func TestSplitAbsoluteProjectRoot(t *testing.T) {
}
for _, want := range importPaths {
// actually create the directory so lstat won't fail
h.TempDir(fmt.Sprintf("src/%s", want))
// create the target directory so lstat doesn't fail
h.TempDir(filepath.Join("src", want))
fullpath := filepath.Join(depCtx.GOPATH, "src", want)
got, err := depCtx.SplitAbsoluteProjectRoot(fullpath)