Merge pull request #454 from Morganamilo/makepkg

Stop prepare running twice
This commit is contained in:
Anna authored and GitHub committed 2018-06-02 15:23:51 +01:00
commit bd162cc317
1 file changed
+2 -2
+2 -2
View File
@@ -672,7 +672,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")
@@ -711,7 +711,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")