system/yay
system/yay
1
0
Fork 0
mirror of https://github.com/Jguer/yay synced 2024-09-14 13:51:12 +00:00
Code Issues Packages Projects Releases Wiki Activity

Be more exact when looking for cached packages

Browse source 
Instead of looking for `pkgname-pkgver-pkgrel*`
Look for `pkgname-pkgver-pkgrel-arch.pkg*` using the arch set in goalpm.
This commit is contained in:
morganamilo 2018-03-19 10:05:47 +00:00
parent aedbe04b04
commit e09752c23d
No known key found for this signature in database
GPG key ID: 6FE9E7996B0B082E
1 changed files with 15 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
install.go
View file

@ -631,16 +631,28 @@ func downloadPkgBuildsSources(pkgs []*rpc.Pkg, bases map[string][]*rpc.Pkg) (err
} }
func buildInstallPkgBuilds(pkgs []*rpc.Pkg, srcinfos map[string]*gopkg.PKGBUILD, targets stringSet, parser *arguments, bases map[string][]*rpc.Pkg) error { func buildInstallPkgBuilds(pkgs []*rpc.Pkg, srcinfos map[string]*gopkg.PKGBUILD, targets stringSet, parser *arguments, bases map[string][]*rpc.Pkg) error {
alpmArch, err := alpmHandle.Arch()
if err != nil {
return err
}
for _, pkg := range pkgs { for _, pkg := range pkgs {
var arch string
dir := config.BuildDir + pkg.PackageBase + "/" dir := config.BuildDir + pkg.PackageBase + "/"
built := true built := true
srcinfo := srcinfos[pkg.PackageBase] srcinfo := srcinfos[pkg.PackageBase]
version := srcinfo.CompleteVersion() version := srcinfo.CompleteVersion()
if srcinfos[pkg.PackageBase].Arch[0] == "any" {
arch = "any"
} else {
arch = alpmArch
}
if config.ReBuild == "no" || (config.ReBuild == "yes" && !targets.get(pkg.Name)) { if config.ReBuild == "no" || (config.ReBuild == "yes" && !targets.get(pkg.Name)) {
for _, split := range bases[pkg.PackageBase] { for _, split := range bases[pkg.PackageBase] {
file, err := completeFileName(dir, split.Name+"-"+version.String()) file, err := completeFileName(dir, split.Name+"-"+version.String()+"-"+arch+".pkg")
if err != nil { if err != nil {
return err return err
} }
@ -678,13 +690,13 @@ func buildInstallPkgBuilds(pkgs []*rpc.Pkg, srcinfos map[string]*gopkg.PKGBUILD,
depArguments.addArg("D", "asdeps") depArguments.addArg("D", "asdeps")
for _, split := range bases[pkg.PackageBase] { for _, split := range bases[pkg.PackageBase] {
file, err := completeFileName(dir, split.Name+"-"+version.String()) file, err := completeFileName(dir, split.Name+"-"+version.String()+"-"+arch+".pkg")
if err != nil { if err != nil {
return err return err
} }
if file == "" { if file == "" {
return fmt.Errorf("Could not find built package " + split.Name + "-" + version.String()) return fmt.Errorf("Could not find built package " + split.Name + "-" + version.String() + "-" + arch + ".pkg")
} }
arguments.addTarget(file) arguments.addTarget(file)