bryson/pacman
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

libmakepkg: ensure emptydir find command acts on individual directories

Browse source 
Using "-exec command {} +" systax exits on any error.  Such errors occur when
running rmdir on a non-empty directory.  Switch to "{} ;" syntax instead which
avoids exiting before the find command is completed.

Fixes FS#48515.

Note, we can not use "-empty" in the find command because it is not supported
by Busybox find, and the "--ignore-fail-on-non-empty" flag for rmdir is not
available on BSD rmdir variants.

Signed-off-by: Allan McRae <allan@archlinux.org>
(cherry picked from commit baf1ff64e6)
This commit is contained in:
Allan McRae 2016-03-21 11:49:16 +10:00
parent d4f499f563
commit a66cba1b08
1 changed files with 2 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
scripts/libmakepkg/tidy/emptydirs.sh.in
View file

@ -33,6 +33,7 @@ tidy_remove+=('tidy_emptydirs')
tidy_emptydirs() { tidy_emptydirs() {
if check_option "emptydirs" "n"; then if check_option "emptydirs" "n"; then
msg2 "$(gettext "Removing empty directories...")" msg2 "$(gettext "Removing empty directories...")"
find . -depth -type d -exec rmdir '{}' + 2>/dev/null # we are unable to use '-empty' as it is non-POSIX and not support by all find variants
find . -depth -type d -exec rmdir '{}' \; 2>/dev/null
fi fi
} }