Fixed #189: nested dependencies that do not contain VCS information were not being updated properly when --updated-vendored was being used.
diff --git a/CHANGELOG.md b/CHANGELOG.md index 9a0ca7b..9363a10 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md
@@ -1,9 +1,11 @@ # Release 0.8.3 (xxxx-xx-xx) -- Issue #185 and #187: Inaccurate hash being generated for lock file with nested +- Fixed #185 and #187: Inaccurate hash being generated for lock file with nested version ranges. -- Issue #182 and #183: Caching on go-import lookups mishandled some prefixes. +- Fixed #182 and #183: Caching on go-import lookups mishandled some prefixes. - Fixed issue in deduping and sub-package names. +- Fixed #189: nested dependencies that do not contain VCS information were not + being updated properly when --updated-vendored was being used. # Release 0.8.2 (2015-12-21)
diff --git a/cmd/flatten.go b/cmd/flatten.go index 68f0078..a8788c3 100644 --- a/cmd/flatten.go +++ b/cmd/flatten.go
@@ -170,26 +170,21 @@ continue } wd := path.Join(f.top, imp.Name) - if VcsExists(imp, wd) { - if updateCache[imp.Name] { - Debug("----> Already updated %s", imp.Name) - continue - } - Debug("Updating project %s (%s)\n", imp.Name, wd) - if err := VcsUpdate(imp, f.top, home, force, cache, cacheGopath, useGopath); err != nil { - // We can still go on just fine even if this fails. - Warn("Skipped update %s: %s\n", imp.Name, err) - continue - } - updateCache[imp.Name] = true - } else { - Debug("Importing %s to project %s\n", imp.Name, wd) - if err := VcsGet(imp, wd, home, cache, cacheGopath, useGopath); err != nil { - Warn("Skipped getting %s: %v\n", imp.Name, err) - continue - } + + if updateCache[imp.Name] { + Debug("----> Already updated %s", imp.Name) + continue } + Debug("Getting project %s (%s)\n", imp.Name, wd) + + if err := VcsUpdate(imp, f.top, home, force, cache, cacheGopath, useGopath); err != nil { + // We can still go on just fine even if this fails. + Warn("Skipped getting %s: %s\n", imp.Name, err) + continue + } + updateCache[imp.Name] = true + // If a revision has been set use it. err := VcsVersion(imp, f.top) if err != nil {