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

Merge pull request #186 from bcandrea/master

Browse Source 
Update dependency definition in conflicts (fixes #185)
This commit is contained in:
Andrey Smirnov
2015-01-30 19:24:56 +03:00
parent 8375a2c30f 7a1553dc55
commit 0725003107
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
deb/import.go
+1 -1
View File
@@ -140,7 +140,7 @@ func ImportPackageFiles(list *PackageList, packageFiles []string, forceReplace b
}
if forceReplace {
conflictingPackages := list.Search(Dependency{Pkg: p.Name, Version: p.Version, Architecture: p.Architecture}, true)
conflictingPackages := list.Search(Dependency{Pkg: p.Name, Version: p.Version, Relation: VersionEqual, Architecture: p.Architecture}, true)
for _, cp := range conflictingPackages {
reporter.Removed("%s removed due to conflict with package being added", cp)
list.Remove(cp)