浏览代码

Give error when failing to parse .SRCINFO

Instead of panicking later on.
morganamilo 7 年之前
父节点
当前提交
4350752e32
共有 1 个文件被更改,包括 12 次插入11 次删除
  1. 12 11
      install.go

+ 12 - 11
install.go

@@ -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,16 +293,18 @@ func parsesrcinfos(pkgs []*rpc.Pkg, srcinfos map[string]*gopkg.PKGBUILD) error {
 		}
 
 		pkgbuild, err := gopkg.ParseSRCINFOContent(srcinfo)
-		if err == nil {
-			srcinfos[pkg.PackageBase] = pkgbuild
-
-			for _, pkgsource := range pkgbuild.Source {
-				owner, repo := parseSource(pkgsource)
-				if owner != "" && repo != "" {
-					err = branchInfo(pkg.Name, owner, repo)
-					if err != nil {
-						return err
-					}
+		if err != nil {
+			return fmt.Errorf("%s: %s", pkg.Name, err)
+		}
+
+		srcinfos[pkg.PackageBase] = pkgbuild
+
+		for _, pkgsource := range pkgbuild.Source {
+			owner, repo := parseSource(pkgsource)
+			if owner != "" && repo != "" {
+				err = branchInfo(pkg.Name, owner, repo)
+				if err != nil {
+					return err
 				}
 			}
 		}