mirror of
https://github.com/Jguer/yay.git
synced 2025-12-27 10:01:53 -05:00
fix(dbExecutor): rename functions to use dbExecutor
This commit is contained in:
8
cmd.go
8
cmd.go
@@ -324,17 +324,17 @@ func displayNumberMenu(pkgS []string, dbExecutor db.Executor, cmdArgs *settings.
|
||||
switch config.SortMode {
|
||||
case settings.TopDown:
|
||||
if config.Runtime.Mode == settings.ModeRepo || config.Runtime.Mode == settings.ModeAny {
|
||||
pq.printSearch(config.Runtime.DBExecutor)
|
||||
pq.printSearch(dbExecutor)
|
||||
}
|
||||
if config.Runtime.Mode == settings.ModeAUR || config.Runtime.Mode == settings.ModeAny {
|
||||
aq.printSearch(lenpq+1, config.Runtime.DBExecutor)
|
||||
aq.printSearch(lenpq+1, dbExecutor)
|
||||
}
|
||||
case settings.BottomUp:
|
||||
if config.Runtime.Mode == settings.ModeAUR || config.Runtime.Mode == settings.ModeAny {
|
||||
aq.printSearch(lenpq+1, config.Runtime.DBExecutor)
|
||||
aq.printSearch(lenpq+1, dbExecutor)
|
||||
}
|
||||
if config.Runtime.Mode == settings.ModeRepo || config.Runtime.Mode == settings.ModeAny {
|
||||
pq.printSearch(config.Runtime.DBExecutor)
|
||||
pq.printSearch(dbExecutor)
|
||||
}
|
||||
default:
|
||||
return fmt.Errorf(gotext.Get("invalid sort mode. Fix with yay -Y --bottomup --save"))
|
||||
|
||||
@@ -82,7 +82,7 @@ func install(cmdArgs *settings.Arguments, dbExecutor db.Executor, ignoreProvider
|
||||
}
|
||||
}
|
||||
} else if cmdArgs.ExistsArg("y", "refresh") || cmdArgs.ExistsArg("u", "sysupgrade") || len(cmdArgs.Targets) > 0 {
|
||||
err = earlyPacmanCall(cmdArgs, config.Runtime.DBExecutor)
|
||||
err = earlyPacmanCall(cmdArgs, dbExecutor)
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
@@ -91,7 +91,7 @@ func install(cmdArgs *settings.Arguments, dbExecutor db.Executor, ignoreProvider
|
||||
|
||||
// we may have done -Sy, our handle now has an old
|
||||
// database.
|
||||
err = config.Runtime.DBExecutor.RefreshHandle()
|
||||
err = dbExecutor.RefreshHandle()
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
@@ -151,7 +151,7 @@ func install(cmdArgs *settings.Arguments, dbExecutor db.Executor, ignoreProvider
|
||||
targets := stringset.FromSlice(cmdArgs.Targets)
|
||||
|
||||
dp, err := dep.GetPool(requestTargets,
|
||||
warnings, config.Runtime.DBExecutor, config.Runtime.Mode,
|
||||
warnings, dbExecutor, config.Runtime.Mode,
|
||||
ignoreProviders, config.NoConfirm, config.Provides, config.ReBuild, config.RequestSplitN)
|
||||
if err != nil {
|
||||
return err
|
||||
|
||||
@@ -7,8 +7,6 @@ import (
|
||||
"github.com/Morganamilo/go-pacmanconf"
|
||||
"github.com/leonelquinteros/gotext"
|
||||
"github.com/pkg/errors"
|
||||
|
||||
"github.com/Jguer/yay/v10/pkg/db"
|
||||
)
|
||||
|
||||
type TargetMode int
|
||||
@@ -34,7 +32,6 @@ type Runtime struct {
|
||||
ConfigPath string
|
||||
VCSPath string
|
||||
PacmanConf *pacmanconf.Config
|
||||
DBExecutor db.Executor
|
||||
}
|
||||
|
||||
func MakeRuntime() (*Runtime, error) {
|
||||
|
||||
2
print.go
2
print.go
@@ -159,7 +159,7 @@ func biggestPackages(dbExecutor db.Executor) {
|
||||
func localStatistics(dbExecutor db.Executor) error {
|
||||
info := statistics(dbExecutor)
|
||||
|
||||
_, remoteNames, err := query.GetPackageNamesBySource(config.Runtime.DBExecutor)
|
||||
_, remoteNames, err := query.GetPackageNamesBySource(dbExecutor)
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user