mirror of
https://github.com/Jguer/yay
synced 2024-10-05 23:59:13 +00:00
style(deps): reduce scope where possible
This commit is contained in:
parent
a33f43f502
commit
d1a6ead81c
|
@ -215,8 +215,7 @@ func (dp *Pool) _checkMissing(dep string, stack []string, missing *missing, noDe
|
|||
return
|
||||
}
|
||||
|
||||
aurPkg := dp.findSatisfierAur(dep)
|
||||
if aurPkg != nil {
|
||||
if aurPkg := dp.findSatisfierAur(dep); aurPkg != nil {
|
||||
missing.Good.Set(dep)
|
||||
combinedDepList := ComputeCombinedDepList(aurPkg, noDeps, noCheckDeps)
|
||||
for _, deps := range combinedDepList {
|
||||
|
@ -233,8 +232,7 @@ func (dp *Pool) _checkMissing(dep string, stack []string, missing *missing, noDe
|
|||
return
|
||||
}
|
||||
|
||||
repoPkg := dp.findSatisfierRepo(dep)
|
||||
if repoPkg != nil {
|
||||
if repoPkg := dp.findSatisfierRepo(dep); repoPkg != nil {
|
||||
missing.Good.Set(dep)
|
||||
|
||||
if noDeps {
|
||||
|
|
|
@ -28,18 +28,16 @@ func GetOrder(dp *Pool, noDeps, noCheckDeps bool) *Order {
|
|||
|
||||
for _, target := range dp.Targets {
|
||||
dep := target.DepString()
|
||||
aurPkg := dp.Aur[dep]
|
||||
if aurPkg != nil && pkgSatisfies(aurPkg.Name, aurPkg.Version, dep) {
|
||||
|
||||
if aurPkg := dp.Aur[dep]; aurPkg != nil && pkgSatisfies(aurPkg.Name, aurPkg.Version, dep) {
|
||||
do.orderPkgAur(aurPkg, dp, true, noDeps, noCheckDeps)
|
||||
}
|
||||
|
||||
aurPkg = dp.findSatisfierAur(dep)
|
||||
if aurPkg != nil {
|
||||
if aurPkg := dp.findSatisfierAur(dep); aurPkg != nil {
|
||||
do.orderPkgAur(aurPkg, dp, true, noDeps, noCheckDeps)
|
||||
}
|
||||
|
||||
repoPkg := dp.findSatisfierRepo(dep)
|
||||
if repoPkg != nil {
|
||||
if repoPkg := dp.findSatisfierRepo(dep); repoPkg != nil {
|
||||
do.orderPkgRepo(repoPkg, dp, true)
|
||||
}
|
||||
}
|
||||
|
@ -55,13 +53,11 @@ func (do *Order) orderPkgAur(pkg *rpc.Pkg, dp *Pool, runtime, noDeps, noCheckDep
|
|||
|
||||
for i, deps := range ComputeCombinedDepList(pkg, noDeps, noCheckDeps) {
|
||||
for _, dep := range deps {
|
||||
aurPkg := dp.findSatisfierAur(dep)
|
||||
if aurPkg != nil {
|
||||
if aurPkg := dp.findSatisfierAur(dep); aurPkg != nil {
|
||||
do.orderPkgAur(aurPkg, dp, runtime && i == 0, noDeps, noCheckDeps)
|
||||
}
|
||||
|
||||
repoPkg := dp.findSatisfierRepo(dep)
|
||||
if repoPkg != nil {
|
||||
if repoPkg := dp.findSatisfierRepo(dep); repoPkg != nil {
|
||||
do.orderPkgRepo(repoPkg, dp, runtime && i == 0)
|
||||
}
|
||||
}
|
||||
|
@ -84,8 +80,7 @@ func (do *Order) orderPkgRepo(pkg db.IPackage, dp *Pool, runtime bool) {
|
|||
delete(dp.Repo, pkg.Name())
|
||||
|
||||
for _, dep := range dp.AlpmExecutor.PackageDepends(pkg) {
|
||||
repoPkg := dp.findSatisfierRepo(dep.String())
|
||||
if repoPkg != nil {
|
||||
if repoPkg := dp.findSatisfierRepo(dep.String()); repoPkg != nil {
|
||||
do.orderPkgRepo(repoPkg, dp, runtime)
|
||||
}
|
||||
}
|
||||
|
|
|
@ -356,8 +356,7 @@ func (dp *Pool) ResolveRepoDependency(pkg db.IPackage, noDeps bool) {
|
|||
}
|
||||
|
||||
// has satisfier in repo: fetch it
|
||||
repoPkg := dp.AlpmExecutor.SyncSatisfier(dep.String())
|
||||
if repoPkg != nil {
|
||||
if repoPkg := dp.AlpmExecutor.SyncSatisfier(dep.String()); repoPkg != nil {
|
||||
dp.ResolveRepoDependency(repoPkg, noDeps)
|
||||
}
|
||||
}
|
||||
|
|
|
@ -29,8 +29,7 @@ func GetPkgbuilds(dbExecutor db.Executor, httpClient *http.Client, targets []str
|
|||
aur := true
|
||||
dbName, name := text.SplitDBFromName(target)
|
||||
if dbName != "aur" && (mode == settings.ModeAny || mode == settings.ModeRepo) {
|
||||
pkg := dbExecutor.SyncPackage(name)
|
||||
if pkg != nil {
|
||||
if pkg := dbExecutor.SyncPackage(name); pkg != nil {
|
||||
aur = false
|
||||
name = getURLName(pkg)
|
||||
dbName = pkg.DB().Name()
|
||||
|
|
Loading…
Reference in a new issue