vincent/aptly
1
0
Fork 0
mirror of https://github.com/aptly-dev/aptly.git synced 2026-04-19 19:28:22 +00:00
Code Issues Projects Releases Wiki Activity

snapshot: explicity call FilterLatestRefs() where needed rather than calling from Merge()

Browse Source
This commit is contained in:
Ryan Uber
2014-04-22 22:21:38 -07:00
parent d9f8673286
commit 385ac1afd0
3 changed files with 26 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
cmd/db_cleanup.go
View File

@@ -27,7 +27,7 @@ func aptlyDbCleanup(cmd *commander.Command, args []string) error {
return err
}
if repo.RefList() != nil {
existingPackageRefs = existingPackageRefs.Merge(repo.RefList(), false, false)
existingPackageRefs = existingPackageRefs.Merge(repo.RefList(), false)
}
return nil
})
@@ -41,7 +41,7 @@ func aptlyDbCleanup(cmd *commander.Command, args []string) error {
return err
}
if repo.RefList() != nil {
existingPackageRefs = existingPackageRefs.Merge(repo.RefList(), false, false)
existingPackageRefs = existingPackageRefs.Merge(repo.RefList(), false)
}
return nil
})
@@ -54,7 +54,7 @@ func aptlyDbCleanup(cmd *commander.Command, args []string) error {
if err != nil {
return err
}
existingPackageRefs = existingPackageRefs.Merge(snapshot.RefList(), false, false)
existingPackageRefs = existingPackageRefs.Merge(snapshot.RefList(), false)
return nil
})
if err != nil {

11
cmd/snapshot_merge.go
View File

@@ -29,15 +29,16 @@ func aptlySnapshotMerge(cmd *commander.Command, args []string) error {
}
latest := context.flags.Lookup("latest").Value.Get().(bool)
overrideMatching := !latest
result := sources[0].RefList()
for i := 1; i < len(sources); i++ {
if latest {
result = result.Merge(sources[i].RefList(), false, true)
} else {
result = result.Merge(sources[i].RefList(), true, false)
}
result = result.Merge(sources[i].RefList(), overrideMatching)
}
if latest {
result = deb.FilterLatestRefs(result)
}
sourceDescription := make([]string, len(sources))