Fix conflict resolution (again)
This commit is contained in:
parent
075b11ae42
commit
f1ac0f0f82
1 changed files with 6 additions and 2 deletions
|
@ -314,14 +314,18 @@ function ask_clonedir_conflictresolution() {
|
|||
exit 1
|
||||
;;
|
||||
"r"|"R")
|
||||
export "BUILDTOOL_MAKEPKG_REUSE= --noextract --force"
|
||||
if [ -a "${BUILDTOOL_CLONEDIR}/src" ]; then
|
||||
export "BUILDTOOL_MAKEPKG_REUSE= --noextract"
|
||||
elif [ -a "${BUILDTOOL_CLONEDIR}/pkg" ]; then
|
||||
export "BUILDTOOL_MAKEPKG_REUSE=${BUILDTOOL_MAKEPKG_REUSE} --force"
|
||||
fi
|
||||
;;
|
||||
"f"|"F")
|
||||
infoh "Removing existing \$BUILDTOOL_CLONEDIR directory"
|
||||
rm -rf "${BUILDTOOL_CLONEDIR}"
|
||||
;;
|
||||
*)
|
||||
errorh "Invalid answer. Please answer with Y, N or I."
|
||||
errorh "Invalid answer. Please answer with Y, N or I"
|
||||
ask_debug
|
||||
esac
|
||||
}
|
||||
|
|
Reference in a new issue