net-analyzer/fail2ban: Fix pkg_postinst() message conditions (bug #543348 again).

Package-Manager: Portage-2.3.19, Repoman-2.3.6

diff --git a/net-analyzer/fail2ban/fail2ban-0.9.6.ebuild b/net-analyzer/fail2ban/fail2ban-0.9.6.ebuild
index 416c743d3f1fc9a057d281392e7d33f5e9267807..78c4e85f890a87d1bf482b2bbe62685df355ba46 100644 (file)
--- a/net-analyzer/fail2ban/fail2ban-0.9.6.ebuild
+++ b/net-analyzer/fail2ban/fail2ban-0.9.6.ebuild
@@ -84,21 +84,19 @@ pkg_postinst() {
                elog "You are upgrading from version 0.6.x, please see:"
                elog "http://www.fail2ban.org/wiki/index.php/HOWTO_Upgrade_from_0.6_to_0.8"
        fi
-       if ! has_version ${CATEGORY}/${PN}; then
-               if ! has_version dev-python/pyinotify && ! has_version app-admin/gamin; then
-                       elog "For most jail.conf configurations, it is recommended you install either"
-                       elog "dev-python/pyinotify or app-admin/gamin (in order of preference)"
-                       elog "to control how log file modifications are detected"
-               fi
-
-               if ! has_version dev-lang/python[sqlite]; then
-                       elog "If you want to use ${PN}'s persistent database, then reinstall"
-                       elog "dev-lang/python with USE=sqlite"
-               fi
-
-               if has_version sys-apps/systemd[-python]; then
-                       elog "If you want to track logins through sys-apps/systemd's"
-                       elog "journal backend, then reinstall sys-apps/systemd with USE=python"
-               fi
+       if ! has_version dev-python/pyinotify && ! has_version app-admin/gamin; then
+               elog "For most jail.conf configurations, it is recommended you install either"
+               elog "dev-python/pyinotify or app-admin/gamin (in order of preference)"
+               elog "to control how log file modifications are detected"
+       fi
+
+       if ! has_version dev-lang/python[sqlite]; then
+               elog "If you want to use ${PN}'s persistent database, then reinstall"
+               elog "dev-lang/python with USE=sqlite"
+       fi
+
+       if has_version sys-apps/systemd[-python]; then
+               elog "If you want to track logins through sys-apps/systemd's"
+               elog "journal backend, then reinstall sys-apps/systemd with USE=python"
        fi
 }

diff --git a/net-analyzer/fail2ban/fail2ban-0.9.7.ebuild b/net-analyzer/fail2ban/fail2ban-0.9.7.ebuild
index f51e3cf37b7b919ea5d796723ae043421e88c79a..eaa1dbd0fc8908db771229599f688da5a968699d 100644 (file)
--- a/net-analyzer/fail2ban/fail2ban-0.9.7.ebuild
+++ b/net-analyzer/fail2ban/fail2ban-0.9.7.ebuild
@@ -87,21 +87,19 @@ pkg_postinst() {
                elog "http://www.fail2ban.org/wiki/index.php/HOWTO_Upgrade_from_0.6_to_0.8"
        fi
 
-       if ! has_version ${CATEGORY}/${PN}; then
-               if ! has_version dev-python/pyinotify && ! has_version app-admin/gamin; then
-                       elog "For most jail.conf configurations, it is recommended you install either"
-                       elog "dev-python/pyinotify or app-admin/gamin (in order of preference)"
-                       elog "to control how log file modifications are detected"
-               fi
-
-               if ! has_version dev-lang/python[sqlite]; then
-                       elog "If you want to use ${PN}'s persistent database, then reinstall"
-                       elog "dev-lang/python with USE=sqlite"
-               fi
-
-               if has_version sys-apps/systemd[-python]; then
-                       elog "If you want to track logins through sys-apps/systemd's"
-                       elog "journal backend, then reinstall sys-apps/systemd with USE=python"
-               fi
+       if ! has_version dev-python/pyinotify && ! has_version app-admin/gamin; then
+               elog "For most jail.conf configurations, it is recommended you install either"
+               elog "dev-python/pyinotify or app-admin/gamin (in order of preference)"
+               elog "to control how log file modifications are detected"
+       fi
+
+       if ! has_version dev-lang/python[sqlite]; then
+               elog "If you want to use ${PN}'s persistent database, then reinstall"
+               elog "dev-lang/python with USE=sqlite"
+       fi
+
+       if has_version sys-apps/systemd[-python]; then
+               elog "If you want to track logins through sys-apps/systemd's"
+               elog "journal backend, then reinstall sys-apps/systemd with USE=python"
        fi
 }

diff --git a/net-analyzer/fail2ban/fail2ban-99999999.ebuild b/net-analyzer/fail2ban/fail2ban-99999999.ebuild
index b642ecf3d5b382ab69449b37b3dd915b879f6f7f..e847560915e7b42bbd985eb97c003762ac85f75e 100644 (file)
--- a/net-analyzer/fail2ban/fail2ban-99999999.ebuild
+++ b/net-analyzer/fail2ban/fail2ban-99999999.ebuild
@@ -87,21 +87,19 @@ pkg_postinst() {
                elog "http://www.fail2ban.org/wiki/index.php/HOWTO_Upgrade_from_0.6_to_0.8"
        fi
 
-       if ! has_version ${CATEGORY}/${PN}; then
-               if ! has_version dev-python/pyinotify && ! has_version app-admin/gamin; then
-                       elog "For most jail.conf configurations, it is recommended you install either"
-                       elog "dev-python/pyinotify or app-admin/gamin (in order of preference)"
-                       elog "to control how log file modifications are detected"
-               fi
-
-               if ! has_version dev-lang/python[sqlite]; then
-                       elog "If you want to use ${PN}'s persistent database, then reinstall"
-                       elog "dev-lang/python with USE=sqlite"
-               fi
-
-               if has_version sys-apps/systemd[-python]; then
-                       elog "If you want to track logins through sys-apps/systemd's"
-                       elog "journal backend, then reinstall sys-apps/systemd with USE=python"
-               fi
+       if ! has_version dev-python/pyinotify && ! has_version app-admin/gamin; then
+               elog "For most jail.conf configurations, it is recommended you install either"
+               elog "dev-python/pyinotify or app-admin/gamin (in order of preference)"
+               elog "to control how log file modifications are detected"
+       fi
+
+       if ! has_version dev-lang/python[sqlite]; then
+               elog "If you want to use ${PN}'s persistent database, then reinstall"
+               elog "dev-lang/python with USE=sqlite"
+       fi
+
+       if has_version sys-apps/systemd[-python]; then
+               elog "If you want to track logins through sys-apps/systemd's"
+               elog "journal backend, then reinstall sys-apps/systemd with USE=python"
        fi
 }