diff --git a/cmd/snapshot_merge.go b/cmd/snapshot_merge.go index ba06f521..e94f731e 100644 --- a/cmd/snapshot_merge.go +++ b/cmd/snapshot_merge.go @@ -28,12 +28,12 @@ func aptlySnapshotMerge(cmd *commander.Command, args []string) error { } } - newest := context.flags.Lookup("newest").Value.Get().(bool) + latest := context.flags.Lookup("latest").Value.Get().(bool) result := sources[0].RefList() for i := 1; i < len(sources); i++ { - if newest { + if latest { result = result.Merge(sources[i].RefList(), false, true) } else { result = result.Merge(sources[i].RefList(), true, false) @@ -77,7 +77,7 @@ Example: `, } - cmd.Flag.Bool("newest", false, "Take newest package of set during merge") + cmd.Flag.Bool("latest", false, "Use only the latest version of all packages") return cmd } diff --git a/deb/reflist.go b/deb/reflist.go index 631c3b6a..02845214 100644 --- a/deb/reflist.go +++ b/deb/reflist.go @@ -296,8 +296,8 @@ func (l *PackageRefList) Merge(r *PackageRefList, overrideMatching bool, nameL, archL, verL := partsL[0][1:], partsL[1], partsL[2] pkgL := string(nameL) + "." + string(archL) - // If we've already seen this package, regardless of version, - // just skip it. + // If we've already seen this package, check if this version is + // newer. If it is, replace the older ref. if _, ok := refs[pkgL]; ok { vres := CompareVersions(string(verL), string(refs[pkgL])) if vres <= 0 {