commit: 0988016f9d479df15a83e5267fe741e4e2db32af Author: Rolf Eike Beer <eike <AT> sf-mail <DOT> de> AuthorDate: Tue Oct 22 14:50:21 2019 +0000 Commit: Joonas Niilola <juippis <AT> gentoo <DOT> org> CommitDate: Wed Oct 23 13:46:25 2019 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0988016f
net-mail/vpopmail: limit upgrade warnings to affected versions Signed-off-by: Rolf Eike Beer <eike <AT> sf-mail.de> Closes: https://github.com/gentoo/gentoo/pull/13382 Signed-off-by: Joonas Niilola <juippis <AT> gentoo.org> net-mail/vpopmail/vpopmail-5.4.33-r4.ebuild | 28 ++++++++++++++++------------ 1 file changed, 16 insertions(+), 12 deletions(-) diff --git a/net-mail/vpopmail/vpopmail-5.4.33-r4.ebuild b/net-mail/vpopmail/vpopmail-5.4.33-r4.ebuild index 3cbfe467136..fc5ea8ec421 100644 --- a/net-mail/vpopmail/vpopmail-5.4.33-r4.ebuild +++ b/net-mail/vpopmail/vpopmail-5.4.33-r4.ebuild @@ -217,14 +217,16 @@ pkg_postrm() { } upgradewarning() { - ewarn - ewarn "Massive important warning if you are upgrading to 5.2.1-r8 or older" - ewarn "The internal structure of the mail storage has changed for" - ewarn "consistancy with the rest of Gentoo! Please review and utilize the " - ewarn "script at ${VPOP_HOME}/bin/vpopmail-Maildir-dotmaildir-fix.sh" - ewarn "to upgrade your system! (It can do conversions both ways)." - ewarn "You should be able to run it right away without any changes." - ewarn + if has_version "<=net-mail/vpopmail-5.2.1-r8"; then + ewarn + ewarn "Massive important warning if you are upgrading to 5.2.1-r8 or older" + ewarn "The internal structure of the mail storage has changed for" + ewarn "consistancy with the rest of Gentoo! Please review and utilize the " + ewarn "script at ${VPOP_HOME}/bin/vpopmail-Maildir-dotmaildir-fix.sh" + ewarn "to upgrade your system! (It can do conversions both ways)." + ewarn "You should be able to run it right away without any changes." + ewarn + fi elog elog "Use of vpopmail's tcp.smtp[.cdb] is also deprecated now, consider" @@ -232,10 +234,12 @@ upgradewarning() { elog if use mysql; then - elog - elog "If you are upgrading from 5.4.17 or older, you have to fix your" - elog "MySQL tables, please see the UPGRADE file in the documentation!" - elog + if has_version "<=net-mail/vpopmail-5.4.17"; then + elog + elog "If you are upgrading from 5.4.17 or older, you have to fix your" + elog "MySQL tables, please see the UPGRADE file in the documentation!" + elog + fi fi ewarn
