sharpetronics/yay
1
0
Fork 0
mirror of https://github.com/Jguer/yay.git synced 2025-12-15 00:05:43 -05:00
Code Issues Projects Releases Wiki Activity

Fix group install

Browse Source 
Using --asdeps with a group install does not work, this seems like
a rare use case so ignoring for now.
This commit is contained in:
morganamilo 2018-05-30 04:41:59 +01:00
parent 943b2f931a
commit 13754722fd
No known key found for this signature in database
GPG Key ID: 6FE9E7996B0B082E
1 changed files with 14 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
depPool.go
View File

@ -79,19 +79,14 @@ func makeDepPool() (*depPool, error) {
// Includes db/ prefixes and group installs
func (dp *depPool) ResolveTargets(pkgs []string) error {
for _, pkg := range pkgs {
target := toTarget(pkg)
dp.Targets = append(dp.Targets, target)
}
// RPC requests are slow
// Combine as many AUR package requests as possible into a single RPC
// call
aurTargets := make(stringSet)
var err error
//repo := make([]*alpm.Package, 0)
for _, target := range dp.Targets {
for _, pkg := range pkgs {
var err error
target := toTarget(pkg)
// skip targets already satisfied
// even if the user enters db/pkg and aur/pkg the latter will
@ -107,6 +102,7 @@ func (dp *depPool) ResolveTargets(pkgs []string) error {
// aur/ prefix means we only check the aur
if target.Db == "aur" {
dp.Targets = append(dp.Targets, target)
aurTargets.set(target.DepString())
continue
}
@ -124,6 +120,7 @@ func (dp *depPool) ResolveTargets(pkgs []string) error {
}
if err == nil {
dp.Targets = append(dp.Targets, target)
dp.Explicit.set(foundPkg.Name())
dp.ResolveRepoDependency(foundPkg)
continue
@ -135,10 +132,13 @@ func (dp *depPool) ResolveTargets(pkgs []string) error {
//the user specified a db but theres no easy way to do
//it without making alpm_lists so dont bother for now
//db/group is probably a rare use case
_, err := dp.SyncDb.PkgCachebyGroup(target.Name)
group, err := dp.SyncDb.PkgCachebyGroup(target.Name)
if err == nil {
dp.Groups = append(dp.Groups, target.String())
group.ForEach(func(pkg alpm.Package) error {
dp.Explicit.set(pkg.Name())
return nil
})
continue
}
}
@ -147,13 +147,15 @@ func (dp *depPool) ResolveTargets(pkgs []string) error {
if target.Db == "" {
aurTargets.set(target.DepString())
}
dp.Targets = append(dp.Targets, target)
}
if len(aurTargets) > 0 {
err = dp.resolveAURPackages(aurTargets, true)
return dp.resolveAURPackages(aurTargets, true)
}
return err
return nil
}
// Pseudo provides finder.