abuild: fix -K option
make sure we don't delete files when -K is specified fixes #7008
This commit is contained in:
parent
834cb718f6
commit
76f3ac4058
13
abuild.in
13
abuild.in
|
@ -78,8 +78,8 @@ want_check() {
|
|||
cleanup() {
|
||||
local i=
|
||||
[ -z "$subpkgdir" ] && set_xterm_title ""
|
||||
if [ -n "$CLEANUP_FILES" ]; then
|
||||
rm -f $CLEANUP_FILES
|
||||
if [ -n "$keep_build" ]; then
|
||||
return 0
|
||||
fi
|
||||
for i; do
|
||||
case $i in
|
||||
|
@ -1637,7 +1637,7 @@ rootpkg() {
|
|||
cd "$startdir"
|
||||
rm -rf "$pkgdir"
|
||||
[ -n "$FAKEROOT" ] && msg "Entering fakeroot..."
|
||||
do_fakeroot "$abuild_path" $color_opt \
|
||||
do_fakeroot "$abuild_path" $color_opt $keep_build \
|
||||
$_package \
|
||||
prepare_subpackages \
|
||||
prepare_language_packs \
|
||||
|
@ -1952,8 +1952,9 @@ builddeps() {
|
|||
export ABUILD_VISITED="$ABUILD_VISITED $pkg"
|
||||
|
||||
msg "Entering $dir"
|
||||
cd "$dir" && $0 $forceroot $keep $quiet $install_deps \
|
||||
$recursive $upgrade $color_opt abuildindex || return 1
|
||||
cd "$dir" && $0 $forceroot $keep $keep_build $quiet \
|
||||
$install_deps $recursive $upgrade $color_opt \
|
||||
abuildindex || return 1
|
||||
done
|
||||
$SUDO_APK add --upgrade --repository "$REPODEST/$repo" \
|
||||
$apk_opt_wait \
|
||||
|
@ -2261,7 +2262,7 @@ while getopts "AcdfFhkKimnp:P:qrRs:u" opt; do
|
|||
'F') forceroot="-F";;
|
||||
'h') usage;;
|
||||
'k') keep="-k";;
|
||||
'K') CLEANUP="" ERROR_CLEANUP="" ;;
|
||||
'K') keep_build="-K";;
|
||||
'm') disable_colors
|
||||
color_opt="-m";;
|
||||
'n') die "Use newapkbuild to create new aports";;
|
||||
|
|
Loading…
Reference in New Issue