Simplify dependency verification code. #81

This commit is contained in:
Andrey Smirnov
2014-08-27 00:03:46 +04:00
parent 74eee3496c
commit 9bee7cdd08
+5 -6
View File
@@ -281,6 +281,7 @@ func (l *PackageList) VerifyDependencies(options int, architectures []string, so
if sources.Search(dep, false) == nil { if sources.Search(dep, false) == nil {
variantsMissing = append(variantsMissing, dep) variantsMissing = append(variantsMissing, dep)
missingCount++ missingCount++
cache[hash] = false
} else { } else {
cache[hash] = true cache[hash] = true
} }
@@ -288,15 +289,9 @@ func (l *PackageList) VerifyDependencies(options int, architectures []string, so
if options&DepFollowAllVariants == DepFollowAllVariants { if options&DepFollowAllVariants == DepFollowAllVariants {
missing = append(missing, variantsMissing...) missing = append(missing, variantsMissing...)
for _, dep := range variantsMissing {
cache[dep.Hash()] = false
}
} else { } else {
if missingCount == len(variants) { if missingCount == len(variants) {
missing = append(missing, variantsMissing...) missing = append(missing, variantsMissing...)
for _, dep := range variantsMissing {
cache[dep.Hash()] = false
}
} }
} }
} }
@@ -334,6 +329,10 @@ func (l *PackageList) Less(i, j int) bool {
// PrepareIndex prepares list for indexing // PrepareIndex prepares list for indexing
func (l *PackageList) PrepareIndex() { func (l *PackageList) PrepareIndex() {
if l.indexed {
return
}
l.packagesIndex = make([]*Package, l.Len()) l.packagesIndex = make([]*Package, l.Len())
l.providesIndex = make(map[string][]*Package, 128) l.providesIndex = make(map[string][]*Package, 128)