vincent/aptly
1
0
Fork 0
mirror of https://github.com/aptly-dev/aptly.git synced 2026-06-04 05:10:40 +00:00
Code Issues Projects Releases Wiki Activity

Introduce back reflist merging without conflict removal. aptly db cleanup requires

Browse Source 
full reference list collection. #217

Fixes bug with aptly db cleanup removing conflicting packages.
This commit is contained in:
Andrey Smirnov
2015-03-06 14:51:12 +03:00
parent d00659b0cb
commit e63adffdf5
8 changed files with 56 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files
cmd/db_cleanup.go
+4 -4
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)
existingPackageRefs = existingPackageRefs.Merge(repo.RefList(), false, true)
}
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)
existingPackageRefs = existingPackageRefs.Merge(repo.RefList(), false, true)
}
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)
existingPackageRefs = existingPackageRefs.Merge(snapshot.RefList(), false, true)
return nil
})
if err != nil {
@@ -71,7 +71,7 @@ func aptlyDbCleanup(cmd *commander.Command, args []string) error {
}
for _, component := range published.Components() {
existingPackageRefs = existingPackageRefs.Merge(published.RefList(component), false)
existingPackageRefs = existingPackageRefs.Merge(published.RefList(component), false, true)
}
return nil
})
cmd/snapshot_merge.go
+1 -1
View File
@@ -39,7 +39,7 @@ func aptlySnapshotMerge(cmd *commander.Command, args []string) error {
result := sources[0].RefList()
for i := 1; i < len(sources); i++ {
result = result.Merge(sources[i].RefList(), overrideMatching)
result = result.Merge(sources[i].RefList(), overrideMatching, false)
}
if latest {