From 65619596d02a7c41aa876155dea094ca14d0ce0c Mon Sep 17 00:00:00 2001 From: Juan RP Date: Thu, 13 May 2010 15:28:17 +0200 Subject: [PATCH] stow_funcs: check for file and links before dirs while stowning in the chroot. --- xbps-src/shutils/stow_funcs.sh | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/xbps-src/shutils/stow_funcs.sh b/xbps-src/shutils/stow_funcs.sh index f554c178565..514c8767e89 100644 --- a/xbps-src/shutils/stow_funcs.sh +++ b/xbps-src/shutils/stow_funcs.sh @@ -104,10 +104,7 @@ stow_pkg_real() elif [ -d "$XBPS_MASTERDIR/$lfile" ]; then continue fi - if [ -d "$i" ]; then - mkdir -p $XBPS_MASTERDIR/$lfile - - elif [ -f "$i" -o -h "$i" ]; then + if [ -f "$i" -o -h "$i" ]; then # Always copy the pkg metadata flist file. if [ "$(basename $i)" = "flist" ]; then cp -dp $i $XBPS_MASTERDIR/$lfile @@ -140,6 +137,8 @@ stow_pkg_real() # full path. ln -sf $DESTDIR/$lfile $XBPS_MASTERDIR/$lfile fi + elif [ -d "$i" ]; then + mkdir -p $XBPS_MASTERDIR/$lfile fi done