mirror/yay
0
0
Fork 0
mirror of https://github.com/Jguer/yay.git synced 2024-11-07 01:27:21 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/next' into jguer/local-pkgbuild-install

Browse Source
This commit is contained in:
jguer 2022-08-23 17:22:10 +02:00
commit cce21ce0b6
No known key found for this signature in database
GPG Key ID: 6D6CC9BEA8556B35
7 changed files with 10 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
doc/yay.8
View File

@ -536,8 +536,6 @@ builds.
.B \-\-nosudoloop .B \-\-nosudoloop
Do not loop sudo calls in the background. Do not loop sudo calls in the background.
.SH WEB OPTIONS (APPLY TO \-W AND \-\-WEB)
.SH EXAMPLES .SH EXAMPLES
.TP .TP
yay \fIfoo\fR yay \fIfoo\fR

6
pkg/dep/depPool.go
View File

@ -61,10 +61,10 @@ type Pool struct {
Groups []string Groups []string
AlpmExecutor db.Executor AlpmExecutor db.Executor
Warnings *query.AURWarnings Warnings *query.AURWarnings
aurClient *aur.Client aurClient aur.ClientInterface
} }
func newPool(dbExecutor db.Executor, aurClient *aur.Client) *Pool { func newPool(dbExecutor db.Executor, aurClient aur.ClientInterface) *Pool {
dp := &Pool{ dp := &Pool{
Targets: []Target{}, Targets: []Target{},
Explicit: map[string]struct{}{}, Explicit: map[string]struct{}{},
@ -389,7 +389,7 @@ func (dp *Pool) ResolveRepoDependency(pkg db.IPackage, noDeps bool) {
func GetPool(ctx context.Context, pkgs []string, func GetPool(ctx context.Context, pkgs []string,
warnings *query.AURWarnings, warnings *query.AURWarnings,
dbExecutor db.Executor, dbExecutor db.Executor,
aurClient *aur.Client, aurClient aur.ClientInterface,
mode parser.TargetMode, mode parser.TargetMode,
ignoreProviders, noConfirm, provides bool, ignoreProviders, noConfirm, provides bool,
rebuild string, splitN int, noDeps bool, noCheckDeps bool, assumeInstalled []string, rebuild string, splitN int, noDeps bool, noCheckDeps bool, assumeInstalled []string,

2
pkg/query/aur_info.go
View File

@ -84,7 +84,7 @@ func AURInfo(ctx context.Context, aurClient aur.ClientInterface, names []string,
return info, nil return info, nil
} }
func AURInfoPrint(ctx context.Context, aurClient *aur.Client, names []string, splitN int) ([]*Pkg, error) { func AURInfoPrint(ctx context.Context, aurClient aur.ClientInterface, names []string, splitN int) ([]*Pkg, error) {
text.OperationInfoln(gotext.Get("Querying AUR...")) text.OperationInfoln(gotext.Get("Querying AUR..."))
warnings := &AURWarnings{} warnings := &AURWarnings{}

4
pkg/query/mixed_sources.go
View File

@ -25,7 +25,7 @@ const sourceAUR = "aur"
type Builder interface { type Builder interface {
Len() int Len() int
Execute(ctx context.Context, dbExecutor db.Executor, aurClient *aur.Client, pkgS []string) Execute(ctx context.Context, dbExecutor db.Executor, aurClient aur.ClientInterface, pkgS []string)
Results(w io.Writer, dbExecutor db.Executor, verboseSearch SearchVerbosity) error Results(w io.Writer, dbExecutor db.Executor, verboseSearch SearchVerbosity) error
GetTargets(include, exclude intrange.IntRanges, otherExclude stringset.StringSet) ([]string, error) GetTargets(include, exclude intrange.IntRanges, otherExclude stringset.StringSet) ([]string, error)
} }
@ -122,7 +122,7 @@ func (a *abstractResults) Less(i, j int) bool {
return simA > simB return simA > simB
} }
func (s *MixedSourceQueryBuilder) Execute(ctx context.Context, dbExecutor db.Executor, aurClient *aur.Client, pkgS []string) { func (s *MixedSourceQueryBuilder) Execute(ctx context.Context, dbExecutor db.Executor, aurClient aur.ClientInterface, pkgS []string) {
var aurErr error var aurErr error
pkgS = RemoveInvalidTargets(pkgS, s.targetMode) pkgS = RemoveInvalidTargets(pkgS, s.targetMode)

4
pkg/query/source.go
View File

@ -54,7 +54,7 @@ func NewSourceQueryBuilder(
} }
} }
func (s *SourceQueryBuilder) Execute(ctx context.Context, dbExecutor db.Executor, aurClient *aur.Client, pkgS []string) { func (s *SourceQueryBuilder) Execute(ctx context.Context, dbExecutor db.Executor, aurClient aur.ClientInterface, pkgS []string) {
var aurErr error var aurErr error
pkgS = RemoveInvalidTargets(pkgS, s.targetMode) pkgS = RemoveInvalidTargets(pkgS, s.targetMode)
@ -176,7 +176,7 @@ func filterAURResults(pkgS []string, results []aur.Pkg) []aur.Pkg {
} }
// queryAUR searches AUR and narrows based on subarguments. // queryAUR searches AUR and narrows based on subarguments.
func queryAUR(ctx context.Context, aurClient *aur.Client, pkgS []string, searchBy string) ([]aur.Pkg, error) { func queryAUR(ctx context.Context, aurClient aur.ClientInterface, pkgS []string, searchBy string) ([]aur.Pkg, error) {
var ( var (
err error err error
by = getSearchBy(searchBy) by = getSearchBy(searchBy)

2
query.go
View File

@ -19,7 +19,7 @@ import (
) )
// SyncSearch presents a query to the local repos and to the AUR. // SyncSearch presents a query to the local repos and to the AUR.
func syncSearch(ctx context.Context, pkgS []string, aurClient *aur.Client, func syncSearch(ctx context.Context, pkgS []string, aurClient aur.ClientInterface,
dbExecutor db.Executor, queryBuilder query.Builder, verbose bool, dbExecutor db.Executor, queryBuilder query.Builder, verbose bool,
) error { ) error {
queryBuilder.Execute(ctx, dbExecutor, aurClient, pkgS) queryBuilder.Execute(ctx, dbExecutor, aurClient, pkgS)

2
vote.go
View File

@ -22,7 +22,7 @@ func (e *ErrAURVote) Error() string {
} }
func handlePackageVote(ctx context.Context, func handlePackageVote(ctx context.Context,
targets []string, aurClient *aur.Client, targets []string, aurClient aur.ClientInterface,
voteClient *vote.Client, splitN int, upvote bool, voteClient *vote.Client, splitN int, upvote bool,
) error { ) error {
infos, err := query.AURInfoPrint(ctx, aurClient, targets, splitN) infos, err := query.AURInfoPrint(ctx, aurClient, targets, splitN)