[gentoo-commits] repo/gentoo:master commit in: sys-apps/baselayout/

[Mike Gilbert]

commit:     f64897648984946a0aff01d66dceca89adbb194b
Author:     Mike Gilbert <floppym <AT> gentoo <DOT> org>
AuthorDate: Fri Jan 27 22:36:57 2023 +0000
Commit:     Mike Gilbert <floppym <AT> gentoo <DOT> org>
CommitDate: Fri Jan 27 22:37:56 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f6489764

sys-apps/baselayout: tweak /var/{run,lock} check

We only need to abort if these exist as a directory.

Signed-off-by: Mike Gilbert <floppym <AT> gentoo.org>

 sys-apps/baselayout/baselayout-2.11.ebuild | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/sys-apps/baselayout/baselayout-2.11.ebuild 
b/sys-apps/baselayout/baselayout-2.11.ebuild
index f5fe6bb8aa50..481c65c7b9c3 100644
--- a/sys-apps/baselayout/baselayout-2.11.ebuild
+++ b/sys-apps/baselayout/baselayout-2.11.ebuild
@@ -22,17 +22,16 @@ IUSE="build +split-usr"
 RDEPEND="!sys-apps/baselayout-prefix"
 
 pkg_pretend() {
-       local stop
-       if [[ ! -L "${EROOT}"/var/run ]]; then
+       local stop=
+       if [[ ! -L ${EROOT}/var/run && -d ${EROOT}/var/run ]]; then
                eerror "${EROOT}/var/run must be a symlink to ${EROOT}/run"
                stop=1
        fi
-       if [[ ! -L "${EROOT}"/var/lock ]]; then
+       if [[ ! -L ${EROOT}/var/lock && -d ${EROOT}/var/lock ]]; then
                eerror "${EROOT}/var/lock must be a symlink to 
${EROOT}/run/lock"
                stop=1
        fi
-       [[ -n ${stop} ]] &&
-               die "please fix this before emerging baselayout"
+       [[ -z ${stop} ]] || die "please fix this before emerging baselayout"
 }
 
 pkg_setup() {