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.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 7F9C5139694 for ; Mon, 24 Jul 2017 14:17:36 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id C1B511FC03C; Mon, 24 Jul 2017 14:17:35 +0000 (UTC) Received: from smtp.gentoo.org (dev.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id A132D1FC03C for ; Mon, 24 Jul 2017 14:17:35 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id BE401341715 for ; Mon, 24 Jul 2017 14:17:34 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id D0D4674B4 for ; Mon, 24 Jul 2017 14:17:31 +0000 (UTC) From: "Lars Wendler" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Lars Wendler" Message-ID: <1500905847.fd7d47b11f9ec6588e91e9d22784b06adcf80132.polynomial-c@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: www-client/seamonkey/ X-VCS-Repository: repo/gentoo X-VCS-Files: www-client/seamonkey/seamonkey-2.48-r1.ebuild X-VCS-Directories: www-client/seamonkey/ X-VCS-Committer: polynomial-c X-VCS-Committer-Name: Lars Wendler X-VCS-Revision: fd7d47b11f9ec6588e91e9d22784b06adcf80132 X-VCS-Branch: master Date: Mon, 24 Jul 2017 14:17:31 +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-Archives-Salt: fba1490c-9411-46d8-85c8-e4941221bdc6 X-Archives-Hash: 16315d2671fd83e707a95da896109b0d commit: fd7d47b11f9ec6588e91e9d22784b06adcf80132 Author: Lars Wendler gentoo org> AuthorDate: Mon Jul 24 14:17:12 2017 +0000 Commit: Lars Wendler gentoo org> CommitDate: Mon Jul 24 14:17:27 2017 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fd7d47b1 www-client/seamonkey: De-uglify new enigmail code a bit. Package-Manager: Portage-2.3.6, Repoman-2.3.3 www-client/seamonkey/seamonkey-2.48-r1.ebuild | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/www-client/seamonkey/seamonkey-2.48-r1.ebuild b/www-client/seamonkey/seamonkey-2.48-r1.ebuild index e68716cfeda..01fae8065d9 100644 --- a/www-client/seamonkey/seamonkey-2.48-r1.ebuild +++ b/www-client/seamonkey/seamonkey-2.48-r1.ebuild @@ -400,13 +400,14 @@ pkg_preinst() { die "Could not find enigmail on disk during pkg_preinst()" fi if [[ ! -h "${emidpath}" ]] && [[ -d "${emidpath}" ]]; then - rm -Rf "${emidpath}" || ( - eerror "Could not remove enigmail directory from previous installation," - eerror "You must remove this by hand and rename the symbolic link yourself:" - eerror - eerror "\t cd ${EPREFIX}${MOZILLA_FIVE_HOME}/extensions" - eerror "\t rm -Rf ${emid}" - eerror "\t mv ${emid}.backup* ${emid}" ) + if ! rm -R --interactive=never "${emidpath}" ; then + eerror "Could not remove enigmail directory from previous installation," + eerror "You must remove this by hand and rename the symbolic link yourself:" + eerror + eerror "\t cd ${EPREFIX%/}${MOZILLA_FIVE_HOME}/extensions" + eerror "\t rm -Rf ${emid}" + eerror "\t mv ${emid}.backup* ${emid}" + fi fi fi }