Adding version setting to the new import resolver
diff --git a/dependency/resolver.go b/dependency/resolver.go
index 3a999ec..18e03c4 100644
--- a/dependency/resolver.go
+++ b/dependency/resolver.go
@@ -354,12 +354,14 @@
if _, ok := r.alreadyQ[imp]; !ok {
r.alreadyQ[imp] = true
queue.PushBack(r.vpath(imp))
+ r.VersionHandler.SetVersion(imp)
}
case LocUnknown:
msg.Debug("Missing %s. Trying to resolve.", imp)
if ok, err := r.Handler.NotFound(imp); ok {
r.alreadyQ[imp] = true
queue.PushBack(r.vpath(imp))
+ r.VersionHandler.SetVersion(imp)
} else if err != nil {
msg.Warn("Error looking for %s: %s", imp, err)
} else {
@@ -367,12 +369,11 @@
}
case LocGopath:
msg.Info("Found on GOPATH, not vendor: %s", imp)
- // FIXME: This is not right. We need to get the result of
- // OnGopath and decide what to do.
- r.Handler.OnGopath(imp)
if _, ok := r.alreadyQ[imp]; !ok {
+ r.Handler.OnGopath(imp)
r.alreadyQ[imp] = true
queue.PushBack(imp)
+ r.VersionHandler.SetVersion(imp)
}
}
}
