mirror of
https://github.com/Jguer/yay.git
synced 2025-12-27 07:35:48 -05:00
Print an error message when a package isn't found when using -Si (#2718)
This commit is contained in:
32
query.go
32
query.go
@@ -9,6 +9,7 @@ import (
|
|||||||
aur "github.com/Jguer/aur"
|
aur "github.com/Jguer/aur"
|
||||||
alpm "github.com/Jguer/go-alpm/v2"
|
alpm "github.com/Jguer/go-alpm/v2"
|
||||||
mapset "github.com/deckarep/golang-set/v2"
|
mapset "github.com/deckarep/golang-set/v2"
|
||||||
|
"github.com/leonelquinteros/gotext"
|
||||||
|
|
||||||
"github.com/Jguer/yay/v12/pkg/db"
|
"github.com/Jguer/yay/v12/pkg/db"
|
||||||
"github.com/Jguer/yay/v12/pkg/query"
|
"github.com/Jguer/yay/v12/pkg/query"
|
||||||
@@ -37,9 +38,9 @@ func syncInfo(ctx context.Context, run *runtime.Runtime,
|
|||||||
cmdArgs *parser.Arguments, pkgS []string, dbExecutor db.Executor,
|
cmdArgs *parser.Arguments, pkgS []string, dbExecutor db.Executor,
|
||||||
) error {
|
) error {
|
||||||
var (
|
var (
|
||||||
info []aur.Pkg
|
remoteAurPkgs []aur.Pkg
|
||||||
err error
|
err error
|
||||||
missing = false
|
missing = false
|
||||||
)
|
)
|
||||||
|
|
||||||
pkgS = query.RemoveInvalidTargets(run.Logger, pkgS, run.Cfg.Mode)
|
pkgS = query.RemoveInvalidTargets(run.Logger, pkgS, run.Cfg.Mode)
|
||||||
@@ -77,15 +78,26 @@ func syncInfo(ctx context.Context, run *runtime.Runtime,
|
|||||||
noDB = append(noDB, name)
|
noDB = append(noDB, name)
|
||||||
}
|
}
|
||||||
|
|
||||||
info, err = run.AURClient.Get(ctx, &aur.Query{
|
remoteAurPkgs, err = run.AURClient.Get(ctx, &aur.Query{
|
||||||
Needles: noDB,
|
Needles: noDB,
|
||||||
By: aur.Name,
|
By: aur.Name,
|
||||||
})
|
})
|
||||||
if err != nil {
|
if err != nil {
|
||||||
missing = true
|
|
||||||
|
|
||||||
run.Logger.Errorln(err)
|
run.Logger.Errorln(err)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// Check for any missing packages and print errors for any not found
|
||||||
|
found := mapset.NewThreadUnsafeSet[string]()
|
||||||
|
for i := range remoteAurPkgs {
|
||||||
|
found.Add(remoteAurPkgs[i].Name)
|
||||||
|
}
|
||||||
|
|
||||||
|
for _, name := range noDB {
|
||||||
|
if !found.Contains(name) {
|
||||||
|
missing = true
|
||||||
|
run.Logger.Errorln(gotext.Get("No AUR package found for"), " ", name)
|
||||||
|
}
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
if len(repoS) != 0 || (len(aurS) == 0 && len(repoS) == 0) {
|
if len(repoS) != 0 || (len(aurS) == 0 && len(repoS) == 0) {
|
||||||
@@ -100,12 +112,8 @@ func syncInfo(ctx context.Context, run *runtime.Runtime,
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
if len(aurS) != len(info) {
|
for i := range remoteAurPkgs {
|
||||||
missing = true
|
printInfo(run.Logger, run.Cfg, &remoteAurPkgs[i], cmdArgs.ExistsDouble("i"))
|
||||||
}
|
|
||||||
|
|
||||||
for i := range info {
|
|
||||||
printInfo(run.Logger, run.Cfg, &info[i], cmdArgs.ExistsDouble("i"))
|
|
||||||
}
|
}
|
||||||
|
|
||||||
if missing {
|
if missing {
|
||||||
|
|||||||
Reference in New Issue
Block a user