commit:     f8698a457a75d4cfc7a8cc71d7ad1c98d3c60bbc
Author:     Jason Zaman <perfinion <AT> gentoo <DOT> org>
AuthorDate: Sun Feb  4 13:59:24 2018 +0000
Commit:     Jason Zaman <perfinion <AT> gentoo <DOT> org>
CommitDate: Sun Feb  4 14:20:16 2018 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f8698a45

sec-policy/selinux-base-policy: postinst should not die

postinst is not allowed to die and it breaks catalyst stage building.

commit f03eee7017c288deabdfc593079397d480ea473a fixed this for some
versions, this fixes all the other ebuilds too that were missed.

Package-Manager: Portage-2.3.19, Repoman-2.3.6

 .../selinux-base-policy/selinux-base-policy-2.20170204-r1.ebuild    | 6 +++---
 .../selinux-base-policy/selinux-base-policy-2.20170204-r2.ebuild    | 6 +++---
 .../selinux-base-policy/selinux-base-policy-2.20170204-r3.ebuild    | 6 +++---
 .../selinux-base-policy/selinux-base-policy-2.20170204-r4.ebuild    | 6 +++---
 .../selinux-base-policy/selinux-base-policy-2.20170805-r2.ebuild    | 6 +++---
 .../selinux-base-policy/selinux-base-policy-2.20170805-r3.ebuild    | 2 +-
 .../selinux-base-policy/selinux-base-policy-2.20170805-r4.ebuild    | 2 +-
 .../selinux-base-policy/selinux-base-policy-2.20180114-r1.ebuild    | 4 ++--
 sec-policy/selinux-base-policy/selinux-base-policy-9999.ebuild      | 6 +++---
 9 files changed, 22 insertions(+), 22 deletions(-)

diff --git 
a/sec-policy/selinux-base-policy/selinux-base-policy-2.20170204-r1.ebuild 
b/sec-policy/selinux-base-policy/selinux-base-policy-2.20170204-r1.ebuild
index 6782cb71930..159a4384e56 100644
--- a/sec-policy/selinux-base-policy/selinux-base-policy-2.20170204-r1.ebuild
+++ b/sec-policy/selinux-base-policy/selinux-base-policy-2.20170204-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="6"
@@ -104,9 +104,9 @@ pkg_postinst() {
        for i in ${POLICY_TYPES}; do
                einfo "Inserting the following modules, with base, into the $i 
module store: ${MODS}"
 
-               cd /usr/share/selinux/${i} || die "Could not enter 
/usr/share/selinux/${i}"
+               cd /usr/share/selinux/${i}
 
-               semodule -s ${i} ${COMMAND} || die "Failed to load in base and 
modules ${MODS} in the $i policy store"
+               semodule -s ${i} ${COMMAND}
        done
 
        # Relabel depending packages

diff --git 
a/sec-policy/selinux-base-policy/selinux-base-policy-2.20170204-r2.ebuild 
b/sec-policy/selinux-base-policy/selinux-base-policy-2.20170204-r2.ebuild
index dfe1dece31a..5627947be22 100644
--- a/sec-policy/selinux-base-policy/selinux-base-policy-2.20170204-r2.ebuild
+++ b/sec-policy/selinux-base-policy/selinux-base-policy-2.20170204-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="6"
@@ -104,9 +104,9 @@ pkg_postinst() {
        for i in ${POLICY_TYPES}; do
                einfo "Inserting the following modules, with base, into the $i 
module store: ${MODS}"
 
-               cd /usr/share/selinux/${i} || die "Could not enter 
/usr/share/selinux/${i}"
+               cd /usr/share/selinux/${i}
 
-               semodule -s ${i} ${COMMAND} || die "Failed to load in base and 
modules ${MODS} in the $i policy store"
+               semodule -s ${i} ${COMMAND}
        done
 
        # Relabel depending packages

diff --git 
a/sec-policy/selinux-base-policy/selinux-base-policy-2.20170204-r3.ebuild 
b/sec-policy/selinux-base-policy/selinux-base-policy-2.20170204-r3.ebuild
index dfe1dece31a..5627947be22 100644
--- a/sec-policy/selinux-base-policy/selinux-base-policy-2.20170204-r3.ebuild
+++ b/sec-policy/selinux-base-policy/selinux-base-policy-2.20170204-r3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="6"
@@ -104,9 +104,9 @@ pkg_postinst() {
        for i in ${POLICY_TYPES}; do
                einfo "Inserting the following modules, with base, into the $i 
module store: ${MODS}"
 
-               cd /usr/share/selinux/${i} || die "Could not enter 
/usr/share/selinux/${i}"
+               cd /usr/share/selinux/${i}
 
-               semodule -s ${i} ${COMMAND} || die "Failed to load in base and 
modules ${MODS} in the $i policy store"
+               semodule -s ${i} ${COMMAND}
        done
 
        # Relabel depending packages

diff --git 
a/sec-policy/selinux-base-policy/selinux-base-policy-2.20170204-r4.ebuild 
b/sec-policy/selinux-base-policy/selinux-base-policy-2.20170204-r4.ebuild
index dfe1dece31a..5627947be22 100644
--- a/sec-policy/selinux-base-policy/selinux-base-policy-2.20170204-r4.ebuild
+++ b/sec-policy/selinux-base-policy/selinux-base-policy-2.20170204-r4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="6"
@@ -104,9 +104,9 @@ pkg_postinst() {
        for i in ${POLICY_TYPES}; do
                einfo "Inserting the following modules, with base, into the $i 
module store: ${MODS}"
 
-               cd /usr/share/selinux/${i} || die "Could not enter 
/usr/share/selinux/${i}"
+               cd /usr/share/selinux/${i}
 
-               semodule -s ${i} ${COMMAND} || die "Failed to load in base and 
modules ${MODS} in the $i policy store"
+               semodule -s ${i} ${COMMAND}
        done
 
        # Relabel depending packages

diff --git 
a/sec-policy/selinux-base-policy/selinux-base-policy-2.20170805-r2.ebuild 
b/sec-policy/selinux-base-policy/selinux-base-policy-2.20170805-r2.ebuild
index c3e96688105..27177f64715 100644
--- a/sec-policy/selinux-base-policy/selinux-base-policy-2.20170805-r2.ebuild
+++ b/sec-policy/selinux-base-policy/selinux-base-policy-2.20170805-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="6"
@@ -104,9 +104,9 @@ pkg_postinst() {
        for i in ${POLICY_TYPES}; do
                einfo "Inserting the following modules, with base, into the $i 
module store: ${MODS}"
 
-               cd /usr/share/selinux/${i} || die "Could not enter 
/usr/share/selinux/${i}"
+               cd /usr/share/selinux/${i}
 
-               semodule -s ${i} ${COMMAND} || die "Failed to load in base and 
modules ${MODS} in the $i policy store"
+               semodule -s ${i} ${COMMAND}
        done
 
        # Relabel depending packages

diff --git 
a/sec-policy/selinux-base-policy/selinux-base-policy-2.20170805-r3.ebuild 
b/sec-policy/selinux-base-policy/selinux-base-policy-2.20170805-r3.ebuild
index 8ef5919d347..27177f64715 100644
--- a/sec-policy/selinux-base-policy/selinux-base-policy-2.20170805-r3.ebuild
+++ b/sec-policy/selinux-base-policy/selinux-base-policy-2.20170805-r3.ebuild
@@ -104,7 +104,7 @@ pkg_postinst() {
        for i in ${POLICY_TYPES}; do
                einfo "Inserting the following modules, with base, into the $i 
module store: ${MODS}"
 
-               cd /usr/share/selinux/${i} || die "Could not enter 
/usr/share/selinux/${i}"
+               cd /usr/share/selinux/${i}
 
                semodule -s ${i} ${COMMAND}
        done

diff --git 
a/sec-policy/selinux-base-policy/selinux-base-policy-2.20170805-r4.ebuild 
b/sec-policy/selinux-base-policy/selinux-base-policy-2.20170805-r4.ebuild
index 33d98c80502..e58899c1855 100644
--- a/sec-policy/selinux-base-policy/selinux-base-policy-2.20170805-r4.ebuild
+++ b/sec-policy/selinux-base-policy/selinux-base-policy-2.20170805-r4.ebuild
@@ -104,7 +104,7 @@ pkg_postinst() {
        for i in ${POLICY_TYPES}; do
                einfo "Inserting the following modules, with base, into the $i 
module store: ${MODS}"
 
-               cd /usr/share/selinux/${i} || die "Could not enter 
/usr/share/selinux/${i}"
+               cd /usr/share/selinux/${i}
 
                semodule -s ${i} ${COMMAND}
        done

diff --git 
a/sec-policy/selinux-base-policy/selinux-base-policy-2.20180114-r1.ebuild 
b/sec-policy/selinux-base-policy/selinux-base-policy-2.20180114-r1.ebuild
index 5dadfcb0904..e58899c1855 100644
--- a/sec-policy/selinux-base-policy/selinux-base-policy-2.20180114-r1.ebuild
+++ b/sec-policy/selinux-base-policy/selinux-base-policy-2.20180114-r1.ebuild
@@ -104,9 +104,9 @@ pkg_postinst() {
        for i in ${POLICY_TYPES}; do
                einfo "Inserting the following modules, with base, into the $i 
module store: ${MODS}"
 
-               cd /usr/share/selinux/${i} || die "Could not enter 
/usr/share/selinux/${i}"
+               cd /usr/share/selinux/${i}
 
-               semodule -s ${i} ${COMMAND} || die "Failed to load in base and 
modules ${MODS} in the $i policy store"
+               semodule -s ${i} ${COMMAND}
        done
 
        # Relabel depending packages

diff --git a/sec-policy/selinux-base-policy/selinux-base-policy-9999.ebuild 
b/sec-policy/selinux-base-policy/selinux-base-policy-9999.ebuild
index 111bd573773..e58899c1855 100644
--- a/sec-policy/selinux-base-policy/selinux-base-policy-9999.ebuild
+++ b/sec-policy/selinux-base-policy/selinux-base-policy-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="6"
@@ -104,9 +104,9 @@ pkg_postinst() {
        for i in ${POLICY_TYPES}; do
                einfo "Inserting the following modules, with base, into the $i 
module store: ${MODS}"
 
-               cd /usr/share/selinux/${i} || die "Could not enter 
/usr/share/selinux/${i}"
+               cd /usr/share/selinux/${i}
 
-               semodule -s ${i} ${COMMAND} || die "Failed to load in base and 
modules ${MODS} in the $i policy store"
+               semodule -s ${i} ${COMMAND}
        done
 
        # Relabel depending packages

Reply via email to