Fix reusing clone dir
This commit is contained in:
parent
efa14b732b
commit
43696edbc8
1 changed files with 4 additions and 2 deletions
|
@ -297,7 +297,9 @@ function ask_clonedir_conflictresolution() {
|
||||||
errorh "Conflict resolution failed"
|
errorh "Conflict resolution failed"
|
||||||
exit 1
|
exit 1
|
||||||
;;
|
;;
|
||||||
"r"|"R") ;;
|
"r"|"R")
|
||||||
|
export "BUILDTOOL_MAKEPKG_REUSE= --noextract"
|
||||||
|
;;
|
||||||
"f"|"F")
|
"f"|"F")
|
||||||
infoh "Removing existing \$BUILDTOOL_CLONEDIR directory"
|
infoh "Removing existing \$BUILDTOOL_CLONEDIR directory"
|
||||||
#rm -rf "${BUILDTOOL_CLONEDIR}"
|
#rm -rf "${BUILDTOOL_CLONEDIR}"
|
||||||
|
@ -361,7 +363,7 @@ fi
|
||||||
|
|
||||||
# Build package
|
# Build package
|
||||||
infoh "Building package"
|
infoh "Building package"
|
||||||
if ! ${BUILDTOOL_BUILDCMDLINE} "${BUILDTOOL_PKGBUILD_XCONFIG}" "${BUILDTOOL_PKGBUILD_NCONFIG}" "${BUILDTOOL_PKGBUILD_CPFINALCONFIG}" "${BUILDTOOL_PKGBUILD_MODPROBEDDB}" "${BUILDTOOL_PKGBUILD_SUBARCHITECTURE}" "${BUILDTOOL_PKGBUILD_DEBUG}" makepkg --syncdeps -p PKGBUILD.buildtool; then
|
if ! ${BUILDTOOL_BUILDCMDLINE} "${BUILDTOOL_PKGBUILD_XCONFIG}" "${BUILDTOOL_PKGBUILD_NCONFIG}" "${BUILDTOOL_PKGBUILD_CPFINALCONFIG}" "${BUILDTOOL_PKGBUILD_MODPROBEDDB}" "${BUILDTOOL_PKGBUILD_SUBARCHITECTURE}" "${BUILDTOOL_PKGBUILD_DEBUG}" makepkg --syncdeps${BUILDTOOL_MAKEPKG_REUSE} -p PKGBUILD.buildtool; then
|
||||||
errorh "Failed package compilation: makepkg returned with non-zero exit code"
|
errorh "Failed package compilation: makepkg returned with non-zero exit code"
|
||||||
errore "Please report this at \"${BUILDTOOL_ISSUETRACKER}\""
|
errore "Please report this at \"${BUILDTOOL_ISSUETRACKER}\""
|
||||||
exit 1
|
exit 1
|
||||||
|
|
Reference in a new issue