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

Give error when failing to parse .SRCINFO

Browse source 
Instead of panicking later on.
This commit is contained in:
morganamilo 2018-02-18 14:48:49 +00:00
parent 0f3ccbce93
commit 4350752e32
No known key found for this signature in database
GPG key ID: 6FE9E7996B0B082E
1 changed files with 11 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
install.go
View file

@ -280,7 +280,6 @@ func askEditPkgBuilds(pkgs []*rpc.Pkg, bases map[string][]*rpc.Pkg) error {
} }
func parsesrcinfos(pkgs []*rpc.Pkg, srcinfos map[string]*gopkg.PKGBUILD) error { func parsesrcinfos(pkgs []*rpc.Pkg, srcinfos map[string]*gopkg.PKGBUILD) error {
for _, pkg := range pkgs { for _, pkg := range pkgs {
dir := config.BuildDir + pkg.PackageBase + "/" dir := config.BuildDir + pkg.PackageBase + "/"
@ -294,16 +293,18 @@ func parsesrcinfos(pkgs []*rpc.Pkg, srcinfos map[string]*gopkg.PKGBUILD) error {
} }
pkgbuild, err := gopkg.ParseSRCINFOContent(srcinfo) pkgbuild, err := gopkg.ParseSRCINFOContent(srcinfo)
if err == nil { if err != nil {
srcinfos[pkg.PackageBase] = pkgbuild return fmt.Errorf("%s: %s", pkg.Name, err)
}
for _, pkgsource := range pkgbuild.Source { srcinfos[pkg.PackageBase] = pkgbuild
owner, repo := parseSource(pkgsource)
if owner != "" && repo != "" { for _, pkgsource := range pkgbuild.Source {
err = branchInfo(pkg.Name, owner, repo) owner, repo := parseSource(pkgsource)
if err != nil { if owner != "" && repo != "" {
return err err = branchInfo(pkg.Name, owner, repo)
} if err != nil {
return err
} }
} }
} }