Rounded out handling relative imports
diff --git a/dependency/resolver.go b/dependency/resolver.go index e3654d8..45ffb53 100644 --- a/dependency/resolver.go +++ b/dependency/resolver.go
@@ -9,6 +9,7 @@ "github.com/Masterminds/glide/cfg" "github.com/Masterminds/glide/msg" + gpath "github.com/Masterminds/glide/path" "github.com/Masterminds/glide/util" ) @@ -287,6 +288,10 @@ // and moved. l.PushBack(filepath.Join(r.VendorDir, filepath.FromSlash(imp))) } + case LocRelative: + if strings.HasPrefix(imp, "./"+gpath.VendorDir) { + msg.Warn("Go package resolving will resolve %s without the ./%s/ prefix", imp, gpath.VendorDir) + } } }
diff --git a/tree/tree.go b/tree/tree.go index 8f0a0b5..75be199 100644 --- a/tree/tree.go +++ b/tree/tree.go
@@ -103,6 +103,11 @@ Name: name, } + if strings.HasPrefix(name, "./") || strings.HasPrefix(name, "../") { + info.Loc = dependency.LocRelative + return info + } + // Recurse backward to scan other vendor/ directories // If the cwd isn't an absolute path walking upwards looking for vendor/ // folders can get into an infinate loop.