From fae0c506cc18ad657387e64840951f1006a53534 Mon Sep 17 00:00:00 2001 From: morganamilo Date: Fri, 16 Mar 2018 01:14:34 +0000 Subject: [PATCH] Support db/name for groups --- dependencies.go | 2 +- install.go | 16 ++++++++++++---- query.go | 2 +- 3 files changed, 14 insertions(+), 6 deletions(-) diff --git a/dependencies.go b/dependencies.go index c459346c..a28546f8 100644 --- a/dependencies.go +++ b/dependencies.go @@ -290,7 +290,7 @@ func getDepTree(pkgs []string) (*depTree, error) { continue } - _, isGroup := syncDb.PkgCachebyGroup(pkg) + _, isGroup := syncDb.PkgCachebyGroup(name) if isGroup == nil { continue } diff --git a/install.go b/install.go index 3945bcfc..7a33c1bf 100644 --- a/install.go +++ b/install.go @@ -104,12 +104,20 @@ func install(parser *arguments) error { } for _, pkg := range dc.Repo { - arguments.addTarget(pkg.Name()) + arguments.addTarget(pkg.DB().Name() + "/" + pkg.Name()) } - //for _, pkg := range repoTargets { - // arguments.addTarget(pkg) - //} + dbList, err := alpmHandle.SyncDbs() + if err != nil { + return err + } + for _, pkg := range repoTargets { + _, name := splitDbFromName(pkg) + _, errdb := dbList.PkgCachebyGroup(name) + if errdb == nil { + arguments.addTarget(pkg) + } + } if len(dc.Aur) == 0 && len(arguments.targets) == 0 { fmt.Println("There is nothing to do") diff --git a/query.go b/query.go index 0dcca28c..8974ab78 100644 --- a/query.go +++ b/query.go @@ -249,7 +249,7 @@ func packageSlices(toCheck []string) (aur []string, repo []string, err error) { found := errdb == nil if !found { - _, errdb = dbList.PkgCachebyGroup(_pkg) + _, errdb = dbList.PkgCachebyGroup(name) found = errdb == nil }