summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSven Vermeulen <swift@gentoo.org>2014-08-30 20:20:47 +0000
committerSven Vermeulen <swift@gentoo.org>2014-08-30 20:20:47 +0000
commit8c4e84a838773730afc3dc70c507fb4d7c8950ce (patch)
tree3c0fa50e44e4b65636ecd0aeb35deeb936e3b6fa /sec-policy
parentonly support python-3.3 or newer due to upstream bugs in python 2.x (diff)
downloadgentoo-2-8c4e84a838773730afc3dc70c507fb4d7c8950ce.tar.gz
gentoo-2-8c4e84a838773730afc3dc70c507fb4d7c8950ce.tar.bz2
gentoo-2-8c4e84a838773730afc3dc70c507fb4d7c8950ce.zip
Use single-line rlpkg call and do not label policy packages
(Portage version: 2.2.8-r1/cvs/Linux x86_64, signed Manifest commit with key 0x2EDD52403B68AF47)
Diffstat (limited to 'sec-policy')
-rw-r--r--sec-policy/selinux-base-policy/ChangeLog6
-rw-r--r--sec-policy/selinux-base-policy/selinux-base-policy-9999.ebuild13
2 files changed, 11 insertions, 8 deletions
diff --git a/sec-policy/selinux-base-policy/ChangeLog b/sec-policy/selinux-base-policy/ChangeLog
index cb056801a9e1..622e0ef180af 100644
--- a/sec-policy/selinux-base-policy/ChangeLog
+++ b/sec-policy/selinux-base-policy/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for sec-policy/selinux-base-policy
# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-base-policy/ChangeLog,v 1.153 2014/08/24 07:53:58 swift Exp $
+# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-base-policy/ChangeLog,v 1.154 2014/08/30 20:20:47 swift Exp $
+
+ 30 Aug 2014; Sven Vermeulen <swift@gentoo.org>
+ selinux-base-policy-9999.ebuild:
+ Use single-line rlpkg call and do not label policy packages
24 Aug 2014; Sven Vermeulen <swift@gentoo.org>
selinux-base-policy-9999.ebuild:
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 83fbb3c1f077..947e0fb6f480 100644
--- a/sec-policy/selinux-base-policy/selinux-base-policy-9999.ebuild
+++ b/sec-policy/selinux-base-policy/selinux-base-policy-9999.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-base-policy/selinux-base-policy-9999.ebuild,v 1.13 2014/08/24 07:53:58 swift Exp $
+# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-base-policy/selinux-base-policy-9999.ebuild,v 1.14 2014/08/30 20:20:47 swift Exp $
EAPI="5"
inherit eutils
@@ -135,12 +135,11 @@ pkg_postinst() {
# Relabel depending packages
PKGSET="";
if [ -x /usr/bin/qdepends ] ; then
- PKGSET=$(/usr/bin/qdepends -Cq -Q ${CATEGORY}/${PN});
+ PKGSET=$(/usr/bin/qdepends -Cq -Q ${CATEGORY}/${PN} | grep -v 'sec-policy/selinux-');
elif [ -x /usr/bin/equery ] ; then
- PKGSET=$(/usr/bin/equery -Cq depends ${CATEGORY}/${PN});
+ PKGSET=$(/usr/bin/equery -Cq depends ${CATEGORY}/${PN} | grep -v 'sec-policy/selinux-');
+ fi
+ if [ -n "${PKGSET}" ] ; then
+ rlpkg ${PKGSET};
fi
- for PKG in ${PKGSET};
- do
- rlpkg ${PKG};
- done
}