mirrors/yay
1
0
Fork 0
mirror of https://github.com/Jguer/yay.git synced 2025-08-11 09:07:09 +02:00
Code Issues Projects Releases Wiki Activity

Try alpmArch and any when looking for built pkgs.

Browse Source 
Instead of trying to figure out if the package is of arch any just try
both.
This commit is contained in:
morganamilo 2018-04-02 14:56:07 +01:00
parent 5b7daa129a
commit ed964bf04d
No known key found for this signature in database
GPG Key ID: 6FE9E7996B0B082E
1 changed files with 15 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
install.go
View File

@ -567,25 +567,18 @@ func downloadPkgBuildsSources(pkgs []*rpc.Pkg, bases map[string][]*rpc.Pkg, inco
} }
func buildInstallPkgBuilds(pkgs []*rpc.Pkg, srcinfos map[string]*gopkg.PKGBUILD, targets stringSet, parser *arguments, bases map[string][]*rpc.Pkg, incompatable stringSet) error { func buildInstallPkgBuilds(pkgs []*rpc.Pkg, srcinfos map[string]*gopkg.PKGBUILD, targets stringSet, parser *arguments, bases map[string][]*rpc.Pkg, incompatable stringSet) error {
alpmArch, err := alpmHandle.Arch() arch, err := alpmHandle.Arch()
if err != nil { if err != nil {
return err 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()+"-"+arch+".pkg") file, err := completeFileName(dir, split.Name+"-"+version.String()+"-"+arch+".pkg")
@ -593,6 +586,13 @@ func buildInstallPkgBuilds(pkgs []*rpc.Pkg, srcinfos map[string]*gopkg.PKGBUILD,
return err return err
} }
if file == "" {
file, err = completeFileName(dir, split.Name+"-"+version.String()+"-"+"any"+".pkg")
if err != nil {
return err
}
}
if file == "" { if file == "" {
built = false built = false
} }
@ -637,6 +637,13 @@ func buildInstallPkgBuilds(pkgs []*rpc.Pkg, srcinfos map[string]*gopkg.PKGBUILD,
return err return err
} }
if file == "" {
file, err = completeFileName(dir, split.Name+"-"+version.String()+"-"+"any"+".pkg")
if err != nil {
return err
}
}
if file == "" { if file == "" {
return fmt.Errorf("Could not find built package " + split.Name + "-" + version.String() + "-" + arch + ".pkg") return fmt.Errorf("Could not find built package " + split.Name + "-" + version.String() + "-" + arch + ".pkg")
} }