system/yay
system/yay
1
0
Fork 0
mirror of https://github.com/Jguer/yay synced 2024-08-31 21:58:39 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix(yay): display network error on yay number menu, closes #1172

Browse source
This commit is contained in:
jguer 2021-09-08 23:02:49 +02:00
parent 84e872ebe3
commit 4122716ea1
No known key found for this signature in database
GPG key ID: 6D6CC9BEA8556B35
1 changed files with 8 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
cmd.go
View file

@ -363,10 +363,10 @@ func handleRemove(ctx context.Context, cmdArgs *parser.Arguments, localCache *vc
// NumberMenu presents a CLI for selecting packages to install. // NumberMenu presents a CLI for selecting packages to install.
func displayNumberMenu(ctx context.Context, pkgS []string, dbExecutor db.Executor, cmdArgs *parser.Arguments) error { func displayNumberMenu(ctx context.Context, pkgS []string, dbExecutor db.Executor, cmdArgs *parser.Arguments) error {
var ( var (
aurErr, repoErr error aurErr error
aq aurQuery aq aurQuery
pq repoQuery pq repoQuery
lenaq, lenpq int lenaq, lenpq int
) )
pkgS = query.RemoveInvalidTargets(pkgS, config.Runtime.Mode) pkgS = query.RemoveInvalidTargets(pkgS, config.Runtime.Mode)
@ -379,10 +379,11 @@ func displayNumberMenu(ctx context.Context, pkgS []string, dbExecutor db.Executo
if config.Runtime.Mode.AtLeastRepo() { if config.Runtime.Mode.AtLeastRepo() {
pq = queryRepo(pkgS, dbExecutor) pq = queryRepo(pkgS, dbExecutor)
lenpq = len(pq) lenpq = len(pq)
}
if repoErr != nil { if aurErr != nil {
return repoErr text.Errorln(gotext.Get("Error during AUR search: %s\n", aurErr))
} text.Warnln(gotext.Get("Showing repo packages only"))
} }
if lenpq == 0 && lenaq == 0 { if lenpq == 0 && lenaq == 0 {
@ -410,11 +411,6 @@ func displayNumberMenu(ctx context.Context, pkgS []string, dbExecutor db.Executo
return fmt.Errorf(gotext.Get("invalid sort mode. Fix with yay -Y --bottomup --save")) return fmt.Errorf(gotext.Get("invalid sort mode. Fix with yay -Y --bottomup --save"))
} }
if aurErr != nil {
text.Errorln(gotext.Get("Error during AUR search: %s\n", aurErr))
text.Warnln(gotext.Get("Showing repo packages only"))
}
text.Infoln(gotext.Get("Packages to install (eg: 1 2 3, 1-3 or ^4)")) text.Infoln(gotext.Get("Packages to install (eg: 1 2 3, 1-3 or ^4)"))
text.Info() text.Info()