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 BAA4413933E for ; Fri, 23 Jul 2021 15:57:23 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 08075E0B11; Fri, 23 Jul 2021 15:57:23 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (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 DDBE7E0B11 for ; Fri, 23 Jul 2021 15:57:22 +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 92B5A342A85 for ; Fri, 23 Jul 2021 15:57:21 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 3FA577B2 for ; Fri, 23 Jul 2021 15:57:20 +0000 (UTC) From: "Mike Gilbert" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Mike Gilbert" Message-ID: <1627055836.a950794bde5d33d035a3726f99cc3cbfa618c437.floppym@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: net-firewall/iptables/ X-VCS-Repository: repo/gentoo X-VCS-Files: net-firewall/iptables/iptables-1.8.7.ebuild X-VCS-Directories: net-firewall/iptables/ X-VCS-Committer: floppym X-VCS-Committer-Name: Mike Gilbert X-VCS-Revision: a950794bde5d33d035a3726f99cc3cbfa618c437 X-VCS-Branch: master Date: Fri, 23 Jul 2021 15:57:20 +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: 0e5e548e-31cd-4931-9b78-6f495f3e5774 X-Archives-Hash: 611a73e8c480bcdf99a151c9c791fcc1 commit: a950794bde5d33d035a3726f99cc3cbfa618c437 Author: Mike Gilbert gentoo org> AuthorDate: Fri Jul 23 15:54:56 2021 +0000 Commit: Mike Gilbert gentoo org> CommitDate: Fri Jul 23 15:57:16 2021 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a950794b net-firewall/iptables: bypass 'eselect iptables unset' on upgrades Closes: https://bugs.gentoo.org/760246 Signed-off-by: Mike Gilbert gentoo.org> net-firewall/iptables/iptables-1.8.7.ebuild | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/net-firewall/iptables/iptables-1.8.7.ebuild b/net-firewall/iptables/iptables-1.8.7.ebuild index a6ba56cb354..079e1fb2cba 100644 --- a/net-firewall/iptables/iptables-1.8.7.ebuild +++ b/net-firewall/iptables/iptables-1.8.7.ebuild @@ -155,8 +155,10 @@ pkg_postinst() { } pkg_prerm() { - elog "Unsetting iptables symlinks before removal" - eselect iptables unset + if [[ -z ${REPLACED_BY_VERSION} ]]; then + elog "Unsetting iptables symlinks before removal" + eselect iptables unset + fi if ! has_version 'net-firewall/ebtables'; then elog "Unsetting ebtables symlinks before removal"