Give error when failing to parse .SRCINFO

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

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 {
for _, pkg := range pkgs {
dir := config.BuildDir + pkg.PackageBase + "/"
@ -294,7 +293,10 @@ func parsesrcinfos(pkgs []*rpc.Pkg, srcinfos map[string]*gopkg.PKGBUILD) error {
}
pkgbuild, err := gopkg.ParseSRCINFOContent(srcinfo)
if err == nil {
if err != nil {
return fmt.Errorf("%s: %s", pkg.Name, err)
}
srcinfos[pkg.PackageBase] = pkgbuild
for _, pkgsource := range pkgbuild.Source {
@ -307,7 +309,6 @@ func parsesrcinfos(pkgs []*rpc.Pkg, srcinfos map[string]*gopkg.PKGBUILD) error {
}
}
}
}
return nil
}