[gentoo-commits] repo/gentoo:master commit in: sec-policy/selinux-base-policy/

public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed

From: "Jason Zaman" <perfinion@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] repo/gentoo:master commit in: sec-policy/selinux-base-policy/
Date: Sun,  4 Feb 2018 14:23:04 +0000 (UTC)	[thread overview]
Message-ID: <1517754016.f8698a457a75d4cfc7a8cc71d7ad1c98d3c60bbc.perfinion@gentoo> (raw)

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

next             reply	other threads:[~2018-02-04 14:23 UTC|newest]

Thread overview: 17+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2018-02-04 14:23 Jason Zaman [this message]
  -- strict thread matches above, loose matches on Subject: below --
2024-07-19 19:50 [gentoo-commits] repo/gentoo:master commit in: sec-policy/selinux-base-policy/ Jakov Smolić
2022-11-09 19:50 Arthur Zamarin
2022-01-09  5:46 Jason Zaman
2022-01-01 22:44 Jason Zaman
2021-02-02  4:14 Jason Zaman
2019-12-21 14:11 Jason Zaman
2019-04-20  8:24 Jason Zaman
2018-07-12 15:30 Jason Zaman
2018-06-09  5:09 Jason Zaman
2018-02-18 17:16 Patrice Clement
2018-01-09 17:58 Jason Zaman
2017-08-27 14:58 Jason Zaman
2016-12-11 20:01 Jason Zaman
2016-06-05  9:00 Sven Vermeulen
2016-06-04  8:49 Jason Zaman
2016-03-23 22:37 Jason Zaman

find likely ancestor, descendant, or conflicting patches for this message:
( dfblob:6782cb7193 dfblob:159a4384e5 dfblob:dfe1dece31
dfblob:5627947be2 dfblob:dfe1dece31 dfblob:5627947be2 dfblob:dfe1dece31
dfblob:5627947be2 dfblob:c3e9668810 dfblob:27177f6471 dfblob:8ef5919d34
dfblob:27177f6471 dfblob:33d98c8050 dfblob:e58899c185 dfblob:5dadfcb090
dfblob:e58899c185 dfblob:111bd57377 dfblob:e58899c185 )
 OR (
bs:"[gentoo-commits] repo/gentoo:master commit in: sec-policy/selinux-base-policy/" )
	(help)

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1517754016.f8698a457a75d4cfc7a8cc71d7ad1c98d3c60bbc.perfinion@gentoo \
    --to=perfinion@gentoo.org \
    --cc=gentoo-commits@lists.gentoo.org \
    --cc=gentoo-dev@lists.gentoo.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link

Be sure your reply has a Subject: header at the top and a blank line before the message body.

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox