From 8c3c125900636a94793f0c2c210c6e3d04d64e86 Mon Sep 17 00:00:00 2001 From: morganamilo Date: Thu, 15 Feb 2018 07:25:20 +0000 Subject: [PATCH] Bump pkgver before parsing .SRCINFO --- install.go | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/install.go b/install.go index 756433ac..d338c34e 100644 --- a/install.go +++ b/install.go @@ -109,16 +109,7 @@ func install(parser *arguments) error { if err != nil { 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 @@ -137,6 +128,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 + } + err = buildInstallPkgBuilds(dc.AurMake, parser.targets) if err != nil { return err @@ -323,7 +323,7 @@ func dowloadPkgBuilds(pkgs []*rpc.Pkg) (err error) { func downloadPkgBuildsSources(pkgs []*rpc.Pkg) (err error) { for _, pkg := range pkgs { dir := config.BuildDir + pkg.PackageBase + "/" - err = passToMakepkg(dir, "-f", "--verifysource") + err = passToMakepkg(dir, "--nobuild", "--nocheck", "--noprepare", "--nodeps") if err != nil { return }