fix(deps): fix wrong method implementation

ivivanov18 · Aug 18, 2020 · ce79d53 · ce79d53
1 parent 7b70462
commit ce79d53
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 6 deletions.
diff --git a/download.go b/download.go
@@ -224,7 +224,7 @@ func getPkgbuildsfromABS(pkgs []string, path string, dbExecutor db.Executor, for
 		pkgDB, name := text.SplitDBFromName(pkgN)
 
 		if pkgDB != "" {
-			pkg = dbExecutor.PackageFromDB(name, pkgDB)
+			pkg = dbExecutor.SatisfierFromDB(name, pkgDB)
 		} else {
 			pkg = dbExecutor.SyncSatisfier(name)
 		}

diff --git a/pkg/db/executor.go b/pkg/db/executor.go
@@ -32,7 +32,7 @@ type Executor interface {
 	LocalSatisfierExists(string) bool
 	PackageConflicts(RepoPackage) []alpm.Depend
 	PackageDepends(RepoPackage) []alpm.Depend
-	PackageFromDB(string, string) RepoPackage
+	SatisfierFromDB(string, string) RepoPackage
 	PackageGroups(RepoPackage) []string
 	PackageOptionalDepends(RepoPackage) []alpm.Depend
 	PackageProvides(RepoPackage) []alpm.Depend

diff --git a/pkg/db/ialpm/alpm.go b/pkg/db/ialpm/alpm.go
@@ -342,7 +342,7 @@ func (ae *AlpmExecutor) LocalPackage(pkgName string) db.RepoPackage {
 	return pkg
 }
 
-func (ae *AlpmExecutor) PackageFromDB(pkgName, dbName string) db.RepoPackage {
+func (ae *AlpmExecutor) SatisfierFromDB(pkgName, dbName string) db.RepoPackage {
 	singleDB, err := ae.handle.SyncDBByName(dbName)
 	if err != nil {
 		return nil

diff --git a/pkg/dep/depPool.go b/pkg/dep/depPool.go
@@ -110,7 +110,7 @@ func (dp *Pool) ResolveTargets(pkgs []string,
 
 		// If there'ss a different prefix only look in that repo
 		if target.DB != "" {
-			foundPkg = dp.AlpmExecutor.PackageFromDB(target.DepString(), target.DB)
+			foundPkg = dp.AlpmExecutor.SatisfierFromDB(target.DepString(), target.DB)
 		} else {
 			// otherwise find it in any repo
 			foundPkg = dp.AlpmExecutor.SyncSatisfier(target.DepString())
@@ -201,7 +201,7 @@ func (dp *Pool) findProvides(pkgs stringset.StringSet) error {
 	}
 
 	for pkg := range pkgs {
-		if dp.AlpmExecutor.LocalSatisfierExists(pkg) {
+		if dp.AlpmExecutor.LocalPackage(pkg) != nil {
 			continue
 		}
 		wg.Add(1)
@@ -384,7 +384,7 @@ func (dp *Pool) findSatisfierAurCache(dep string, ignoreProviders, noConfirm, pr
 	seen := make(stringset.StringSet)
 	providerSlice := makeProviders(depName)
 
-	if dp.AlpmExecutor.LocalSatisfierExists(depName) {
+	if dp.AlpmExecutor.LocalPackage(depName) != nil {
 		if pkg, ok := dp.AurCache[dep]; ok && pkgSatisfies(pkg.Name, pkg.Version, dep) {
 			return pkg
 		}