From 15478b615783e9a29c10a1d488af5498e5b3c3d6 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Thu, 8 Dec 2022 03:14:47 +0000 Subject: gentoo auto-resync : 08:12:2022 - 03:14:47 --- sys-apps/systemd/systemd-252.2.ebuild | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) (limited to 'sys-apps/systemd/systemd-252.2.ebuild') diff --git a/sys-apps/systemd/systemd-252.2.ebuild b/sys-apps/systemd/systemd-252.2.ebuild index 03c6870db441..6a423f8c5593 100644 --- a/sys-apps/systemd/systemd-252.2.ebuild +++ b/sys-apps/systemd/systemd-252.2.ebuild @@ -465,16 +465,15 @@ migrate_locale() { pkg_preinst() { if ! use split-usr; then local dir - for dir in bin sbin lib; do - if [[ ! ${EROOT}/${dir} -ef ${EROOT}/usr/${dir} ]]; then - eerror "\"${EROOT}/${dir}\" and \"${EROOT}/usr/${dir}\" are not merged." - eerror "One of them should be a symbolic link to the other one." + for dir in bin sbin lib usr/sbin; do + if [[ ! -L ${EROOT}/${dir} ]]; then + eerror "'${EROOT}/${dir}' is not a symbolic link." FAIL=1 fi done if [[ ${FAIL} ]]; then eerror "Migration to system layout with merged directories must be performed before" - eerror "rebuilding ${CATEGORY}/${PN} with USE=\"-split-usr\" to avoid run-time breakage." + eerror "installing ${CATEGORY}/${PN} with USE=\"-split-usr\" to avoid run-time breakage." die "System layout with split directories still used" fi fi -- cgit v1.2.3