summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMike Gilbert <floppym@gentoo.org>2023-01-27 17:36:57 -0500
committerMike Gilbert <floppym@gentoo.org>2023-01-27 17:37:56 -0500
commitf64897648984946a0aff01d66dceca89adbb194b (patch)
treed152a1781d85aba9fb100218e05d13ca0cc1dc36 /sys-apps
parentnet-misc/unison: drop 2.51.3_p20201127, 2.51.4_rc2 (diff)
downloadgentoo-f64897648984946a0aff01d66dceca89adbb194b.tar.gz
gentoo-f64897648984946a0aff01d66dceca89adbb194b.tar.bz2
gentoo-f64897648984946a0aff01d66dceca89adbb194b.zip
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@gentoo.org>
Diffstat (limited to 'sys-apps')
-rw-r--r--sys-apps/baselayout/baselayout-2.11.ebuild9
1 files 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() {