snailed
/
void-packages
2
0
Fork 0
Code Issues 1 Pull Requests 2 Actions Activity

xbps-src: (zap) correctly empty the masterdir 

Instead of relying on a potentially outdated list of files and dirs to
remove, just remove+recreate the whole masterdir.

This previously led to leftover .xbps* files, which broke subsequent
operations

Fixes #14476
This commit is contained in:
Piraty 2019-10-13 20:27:54 +02:00 committed by Juan RP
parent 427af2c864
commit 80e4a39926
1 changed files with 3 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
xbps-src
View File

@ -329,21 +329,9 @@ bootstrap_update() {
} }
masterdir_zap() { masterdir_zap() {
for f in bin boot builddir destdir dev etc home lib lib32 lib64 mnt \ rm -rf "$XBPS_MASTERDIR"
opt proc root run sbin sys tmp usr var host media xbps \ mkdir -p "$XBPS_MASTERDIR"
void-packages .xbps_chroot_init .xbps_chroot_configured; do msg_normal "$XBPS_MASTERDIR masterdir cleaned up."
if [ -d "$XBPS_MASTERDIR/$f" ]; then
echo "Removing directory $XBPS_MASTERDIR/$f ..."
rm -rf $XBPS_MASTERDIR/$f
elif [ -h "$XBPS_MASTERDIR/$f" ]; then
echo "Removing link $XBPS_MASTERDIR/$f ..."
rm -f $XBPS_MASTERDIR/$f
elif [ -f "$XBPS_MASTERDIR/$f" ]; then
echo "Removing file $XBPS_MASTERDIR/$f ..."
rm -f $XBPS_MASTERDIR/$f
fi
done
echo "$XBPS_MASTERDIR masterdir cleaned up."
} }
exit_func() { exit_func() {