From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 78EB715817D for ; Thu, 6 Jun 2024 14:48:58 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id A7EC1E2A2D; Thu, 6 Jun 2024 14:48:57 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [140.211.166.183]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 83CE5E2A2D for ; Thu, 6 Jun 2024 14:48:57 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 98C0533C1C1 for ; Thu, 6 Jun 2024 14:48:56 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id BA2331396 for ; Thu, 6 Jun 2024 14:48:54 +0000 (UTC) From: "Mike Gilbert" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Mike Gilbert" Message-ID: <1717685267.8f80d73e11b36f6452b396e73821ff3f72d85de7.floppym@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: sys-apps/systemd-utils/ X-VCS-Repository: repo/gentoo X-VCS-Files: sys-apps/systemd-utils/systemd-utils-255.7.ebuild X-VCS-Directories: sys-apps/systemd-utils/ X-VCS-Committer: floppym X-VCS-Committer-Name: Mike Gilbert X-VCS-Revision: 8f80d73e11b36f6452b396e73821ff3f72d85de7 X-VCS-Branch: master Date: Thu, 6 Jun 2024 14:48:54 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: f30d2176-b18b-4117-bd4d-781323a5a893 X-Archives-Hash: 8e70995c545c8cca1b8e97822433875d commit: 8f80d73e11b36f6452b396e73821ff3f72d85de7 Author: Mike Gilbert gentoo org> AuthorDate: Thu Jun 6 14:47:47 2024 +0000 Commit: Mike Gilbert gentoo org> CommitDate: Thu Jun 6 14:47:47 2024 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8f80d73e sys-apps/systemd-utils: add einfo messages to preinst Signed-off-by: Mike Gilbert gentoo.org> sys-apps/systemd-utils/systemd-utils-255.7.ebuild | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/sys-apps/systemd-utils/systemd-utils-255.7.ebuild b/sys-apps/systemd-utils/systemd-utils-255.7.ebuild index f34f50b1db52..01d50ad73596 100644 --- a/sys-apps/systemd-utils/systemd-utils-255.7.ebuild +++ b/sys-apps/systemd-utils/systemd-utils-255.7.ebuild @@ -573,13 +573,14 @@ add_service() { pkg_preinst() { # Migrate /lib/{systemd,udev} to /usr/lib if use split-usr; then - dosym ../usr/lib/systemd /lib/systemd - dosym ../usr/lib/udev /lib/udev local d for d in systemd udev; do + dosym ../usr/lib/${d} /lib/${d} if [[ -e ${EROOT}/lib/${d} && ! -L ${EROOT}/lib/${d} ]]; then - cp -rpPT "${EROOT}"/{,usr/}lib/${d} || die - rm -r "${EROOT}"/lib/${d} || die + einfo "Copying files from '${EROOT}/lib/${d}' to '${EROOT}/usr/lib/${d}'" + cp -rpPT "${EROOT}/lib/${d}" "${EROOT}/usr/lib/${d}" || die + einfo "Removing '${EROOT}/lib/${d}'" + rm -r "${EROOT}/lib/${d}" || die fi done fi