From 83491069d311b2a592c1d087526b3cbcc6333cdb Mon Sep 17 00:00:00 2001 From: morganamilo Date: Thu, 15 Feb 2018 06:17:27 +0000 Subject: [PATCH] Split .SRCINFO parsing to its own function --- install.go | 21 ++++++++++++++++++--- 1 file changed, 18 insertions(+), 3 deletions(-) diff --git a/install.go b/install.go index 9b33a069..756433ac 100644 --- a/install.go +++ b/install.go @@ -110,6 +110,15 @@ func install(parser *arguments) error { return err } + err = parseSRCINFOs(dc.AurMake) + if err != nil { + return err + } + err = parseSRCINFOs(dc.Aur) + if err != nil { + return err + } + if _, ok := arguments.options["gendb"]; ok { fmt.Println("GenDB finished. No packages were installed") return nil @@ -270,8 +279,15 @@ func askEditPkgBuilds(pkgs []*rpc.Pkg) (error) { if err != nil { return err } - } + } + } + return nil +} + +func parseSRCINFOs(pkgs []*rpc.Pkg) error { + for _, pkg := range pkgs { + dir := config.BuildDir + pkg.PackageBase + "/" pkgbuild, err := gopkg.ParseSRCINFO(dir + ".SRCINFO") if err == nil { @@ -280,12 +296,11 @@ func askEditPkgBuilds(pkgs []*rpc.Pkg) (error) { if owner != "" && repo != "" { err = branchInfo(pkg.Name, owner, repo) if err != nil { - fmt.Println(err) + return err } } } } - } return nil