diff options
author | classabbyamp <void@placeviolette.net> | 2024-01-27 23:51:37 +0000 |
---|---|---|
committer | classabbyamp <void@placeviolette.net> | 2024-01-27 23:52:48 +0000 |
commit | 33a5320079f1ea06f444f80810d9756a51c71a7a (patch) | |
tree | b8f81f8c27cedfae81ea38c3eca40b899cc770ad | |
parent | 0ebcc3800058a280684d1167cfa6f6d1edfd807a (diff) | |
download | void-packages-33a5320079f1ea06f444f80810d9756a51c71a7a.tar void-packages-33a5320079f1ea06f444f80810d9756a51c71a7a.tar.gz void-packages-33a5320079f1ea06f444f80810d9756a51c71a7a.tar.bz2 void-packages-33a5320079f1ea06f444f80810d9756a51c71a7a.tar.lz void-packages-33a5320079f1ea06f444f80810d9756a51c71a7a.tar.xz void-packages-33a5320079f1ea06f444f80810d9756a51c71a7a.tar.zst void-packages-33a5320079f1ea06f444f80810d9756a51c71a7a.zip |
xbps-src: fix masterdir creation if "masterdir" exists
need to check if masterdir is for the requested arch or not
-rwxr-xr-x | xbps-src | 3 |
1 files changed, 2 insertions, 1 deletions
@@ -535,7 +535,8 @@ if [ "$XBPS_CHROOT_CMD" = ethereal ]; then else : "${XBPS_MASTERDIR:=$XBPS_DISTDIR/masterdir-$XBPS_MACHINE}" # but use $XBPS_DISTDIR/masterdir if it exists and the new style doesn't - if [ ! -d "${XBPS_MASTERDIR}" ] && [ -d "${XBPS_DISTDIR}/masterdir" ]; then + if [ ! -d "${XBPS_MASTERDIR}" ] && [ -d "${XBPS_DISTDIR}/masterdir" ] \ + && [ "$(cat "${XBPS_DISTDIR}"/masterdir/.xbps_chroot_init)" = "$XBPS_MACHINE" ]; then XBPS_MASTERDIR="${XBPS_DISTDIR}/masterdir" fi fi |