mirrors/yay
1
0
Fork 0
mirror of https://github.com/Jguer/yay.git synced 2025-12-27 10:01:53 -05:00
Code Issues Packages Projects Releases Wiki Activity

Fix deps resolving for installs from SRCINFO (#2190)

Browse Source 
Also made MockBuilder and MockRunner thread-safe.
This commit is contained in:
smolx
2023-06-03 15:53:33 +02:00
committed by GitHub
parent 1568e64d55
commit 0607090719
10 changed files with 436 additions and 63 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
local_install.go
View File

@@ -68,10 +68,7 @@ func installLocalPKGBUILD(
return errors.New(gotext.Get("no target directories specified"))
}
grapher := dep.NewGrapher(dbExecutor, aurCache, false, settings.NoConfirm,
cmdArgs.ExistsDouble("d", "nodeps"), noCheck, cmdArgs.ExistsArg("needed"),
config.Runtime.Logger.Child("grapher"))
graph := topo.New[string, *dep.InstallInfo]()
srcInfos := map[string]*gosrc.Srcinfo{}
for _, targetDir := range cmdArgs.Targets {
if err := srcinfoExists(ctx, config.Runtime.CmdBuilder, targetDir); err != nil {
return err
@@ -82,11 +79,16 @@ func installLocalPKGBUILD(
return errors.Wrap(err, gotext.Get("failed to parse .SRCINFO"))
}
var errG error
graph, errG = grapher.GraphFromSrcInfo(ctx, graph, targetDir, pkgbuild)
if errG != nil {
return errG
}
srcInfos[targetDir] = pkgbuild
}
grapher := dep.NewGrapher(dbExecutor, aurCache, false, settings.NoConfirm,
cmdArgs.ExistsDouble("d", "nodeps"), noCheck, cmdArgs.ExistsArg("needed"),
config.Runtime.Logger.Child("grapher"))
graph := topo.New[string, *dep.InstallInfo]()
graph, err := grapher.GraphFromSrcInfos(ctx, graph, srcInfos)
if err != nil {
return err
}
opService := NewOperationService(ctx, config, dbExecutor)