Merge branch 'master' into skipCleanup

This commit is contained in:
Andrey Smirnov
2017-09-20 17:53:24 +03:00
committed by GitHub
17 changed files with 219 additions and 124 deletions
+1 -1
View File
@@ -518,7 +518,7 @@ func (l *PackageList) FilterWithProgress(queries []PackageQuery, withDependencie
}
searchResults := l.Search(dep, true)
if searchResults != nil {
if len(searchResults) > 0 {
for _, p := range searchResults {
if dependencyOptions&DepVerboseResolve == DepVerboseResolve && progress != nil {
progress.ColoredPrintf("@{g}Injecting package@|: %s", p)
+1 -1
View File
@@ -315,7 +315,7 @@ func (collection *PackageCollection) SearchSupported() bool {
// SearchByKey finds package by exact key
func (collection *PackageCollection) SearchByKey(arch, name, version string) (result *PackageList) {
result = NewPackageList()
result = NewPackageListWithDuplicates(true, 0)
for _, key := range collection.db.KeysByPrefix([]byte(fmt.Sprintf("P%s %s %s", arch, name, version))) {
pkg, err := collection.ByKey(key)