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 F27CC138334 for ; Wed, 23 Oct 2019 13:46:47 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id CB2E1E0A82; Wed, 23 Oct 2019 13:46:45 +0000 (UTC) Received: from smtp.gentoo.org (mail.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 8E1A9E0A76 for ; Wed, 23 Oct 2019 13:46:45 +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 81E8234C25C for ; Wed, 23 Oct 2019 13:46:43 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id BE6E5894 for ; Wed, 23 Oct 2019 13:46:41 +0000 (UTC) From: "Joonas Niilola" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Joonas Niilola" Message-ID: <1571838385.0988016f9d479df15a83e5267fe741e4e2db32af.juippis@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: net-mail/vpopmail/ X-VCS-Repository: repo/gentoo X-VCS-Files: net-mail/vpopmail/vpopmail-5.4.33-r4.ebuild X-VCS-Directories: net-mail/vpopmail/ X-VCS-Committer: juippis X-VCS-Committer-Name: Joonas Niilola X-VCS-Revision: 0988016f9d479df15a83e5267fe741e4e2db32af X-VCS-Branch: master Date: Wed, 23 Oct 2019 13:46:41 +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: 4cd44af7-8f72-4912-9f0e-4b62d8069c48 X-Archives-Hash: 3fb7e42925a6f086780acdcf1c51c624 commit: 0988016f9d479df15a83e5267fe741e4e2db32af Author: Rolf Eike Beer sf-mail de> AuthorDate: Tue Oct 22 14:50:21 2019 +0000 Commit: Joonas Niilola gentoo 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 sf-mail.de> Closes: https://github.com/gentoo/gentoo/pull/13382 Signed-off-by: Joonas Niilola 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