commit: fd7d47b11f9ec6588e91e9d22784b06adcf80132
Author: Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
AuthorDate: Mon Jul 24 14:17:12 2017 +0000
Commit: Lars Wendler <polynomial-c <AT> gentoo <DOT> 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
}
