From 942e389d85cebaf765df323a84d86072edcf7fb1 Mon Sep 17 00:00:00 2001 From: morganamilo Date: Sat, 2 Jun 2018 14:16:00 +0100 Subject: [PATCH] Stop prepare running twice Prepare ends up getting ran twice every time we install a package, theres not problems with doing so apart from a little inefficiency. Previously the install flow would be like this: downlod sources + verify prepare + pkgver bump full build (prepare included) Now on the last point pass no extract to use the srcdir from the previous command and pass noprepare and holdver because we allready did these steps previously. --- install.go | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/install.go b/install.go index c4a5829f..dbb5c118 100644 --- a/install.go +++ b/install.go @@ -597,7 +597,7 @@ func buildInstallPkgBuilds(dp *depPool, do *depOrder, srcinfos map[string]*gopkg srcinfo := srcinfos[pkg.PackageBase] - args := []string{"--nobuild", "-fCc"} + args := []string{"--nobuild", "-fC"} if incompatible.get(pkg.PackageBase) { args = append(args, "--ignorearch") @@ -636,7 +636,7 @@ func buildInstallPkgBuilds(dp *depPool, do *depOrder, srcinfos map[string]*gopkg fmt.Println(bold(yellow(arrow)), cyan(pkg.Name+"-"+pkg.Version)+bold(" Already made -- skipping build")) } else { - args := []string{"-Ccf", "--noconfirm"} + args := []string{"-cf", "--noconfirm", "--noextract", "--noprepare", "--holdver"} if incompatible.get(pkg.PackageBase) { args = append(args, "--ignorearch")