diff options
| author |   Chris PeBenito <pebenito@gentoo.org> | 2003-08-02 05:12:46 +0000 |
|---|---|---|
| committer | Chris PeBenito <pebenito@gentoo.org> | 2003-08-02 05:12:46 +0000 |
| commit | 9e37dc1d022d3c8b31ad9f4844c6e65a26eadddf (patch) | |
| tree | 283e5b9a1c040fe441f06d0730edb90998a8b75c /sys-apps | |
| parent | specify version of base-policy in rdepend, since there is a fix in 20030729 t... (diff) | |
| download | gentoo-2-9e37dc1d022d3c8b31ad9f4844c6e65a26eadddf.tar.gz gentoo-2-9e37dc1d022d3c8b31ad9f4844c6e65a26eadddf.tar.bz2 gentoo-2-9e37dc1d022d3c8b31ad9f4844c6e65a26eadddf.zip | |
Make pkg_setup errors actually stop emerge, so the user can fix the problem.
Diffstat (limited to 'sys-apps')
| -rw-r--r-- | sys-apps/selinux-small/ChangeLog | 6 | ||||
| -rw-r--r-- | sys-apps/selinux-small/Manifest | 8 | ||||
| -rw-r--r-- | sys-apps/selinux-small/selinux-small-2003071106.ebuild | 5 |
3 files changed, 13 insertions, 6 deletions
diff --git a/sys-apps/selinux-small/ChangeLog b/sys-apps/selinux-small/ChangeLog index 5244af64cc16..a4b54b3f4b39 100644 --- a/sys-apps/selinux-small/ChangeLog +++ b/sys-apps/selinux-small/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for sys-apps/selinux-small # Copyright 2000-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/sys-apps/selinux-small/ChangeLog,v 1.26 2003/07/28 19:47:38 pebenito Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-apps/selinux-small/ChangeLog,v 1.27 2003/08/02 05:12:40 pebenito Exp $ + + 02 Aug 2003; Chris PeBenito <pebenito@gentoo.org> + selinux-small-2003071106.ebuild: + Make pkg_setup errors actually stop emerge, so the user can fix the problem. 28 Jul 2003; Chris PeBenito <pebenito@gentoo.org> selinux-small-2003040709-r3.ebuild, selinux-small-2003040709-r4.ebuild, diff --git a/sys-apps/selinux-small/Manifest b/sys-apps/selinux-small/Manifest index 5f338f42ace4..ca9383c73acb 100644 --- a/sys-apps/selinux-small/Manifest +++ b/sys-apps/selinux-small/Manifest @@ -1,10 +1,11 @@ -MD5 dee99353eab983b219a5a8bd98197b24 ChangeLog 6032 -MD5 b02e44767b86c92824f786f03e06f67c selinux-small-2003040709-r3.ebuild 4401 -MD5 8ddeeb15184f8751d85418cc986c71dd selinux-small-2003071106.ebuild 5330 MD5 74ed0ebe40bb920f2c477898e6e9abc0 metadata.xml 457 +MD5 b02e44767b86c92824f786f03e06f67c selinux-small-2003040709-r3.ebuild 4401 MD5 a0be8a387010731864ba44082a0545cb selinux-small-2003040709-r4.ebuild 5449 +MD5 fc502c9d939550cd32da66f24348e155 selinux-small-2003071106.ebuild 5432 +MD5 44726af047d19295e7791ffee56b723d ChangeLog 6199 MD5 0986e11cde481cc9d4f8061654dedead files/digest-selinux-small-2003040709-r3 151 MD5 14ef7a8e2104665076099d6fe3f0f664 files/digest-selinux-small-2003040709-r4 73 +MD5 4ed6e763e1f7562bb3ecb31414f3cb5e files/digest-selinux-small-2003071106 73 MD5 8daee4f4fd3e4a74c4d5f2ddb6b086a5 files/newrole 1197 MD5 89d2840cccbc46b3261d7abc79b757fd files/open_init_pty 441 MD5 40942493cfa58c7011ae2bf7d7db6194 files/rlpkg 2087 @@ -16,4 +17,3 @@ MD5 2ebe97274132b6318b82fe6e3f185ea1 files/selinux-small-2003040709-newrole.diff MD5 16b7e55b13429ce3e437bfc457cc2a8d files/selinux-small-2003040709-newstat.diff 8495 MD5 3809db44913b783d2b8bb31c8361aa92 files/selinux-small-2003040709-setfiles.diff 2623 MD5 e755d9cd5ef299b1b33feb5df633764d files/selinux-small-2003071106-gentoo.diff 11301 -MD5 4ed6e763e1f7562bb3ecb31414f3cb5e files/digest-selinux-small-2003071106 73 diff --git a/sys-apps/selinux-small/selinux-small-2003071106.ebuild b/sys-apps/selinux-small/selinux-small-2003071106.ebuild index 708caaede85a..aea5c8b4a336 100644 --- a/sys-apps/selinux-small/selinux-small-2003071106.ebuild +++ b/sys-apps/selinux-small/selinux-small-2003071106.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2002 Gentoo Technologies, Inc. # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sys-apps/selinux-small/selinux-small-2003071106.ebuild,v 1.2 2003/07/28 19:47:38 pebenito Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-apps/selinux-small/selinux-small-2003071106.ebuild,v 1.3 2003/08/02 05:12:40 pebenito Exp $ DESCRIPTION="SELinux libraries and policy compiler" HOMEPAGE="http://www.nsa.gov/selinux" @@ -31,6 +31,7 @@ pkg_setup() { eerror "incorrect profile. SELinux has a different profile than" eerror "mainline Gentoo. Make sure the /etc/make.profile symbolic" eend 1 "link is pointing to /usr/portage/profiles/selinux-x86-1.4/" + die "Missing USE=\"selinux\"." fi if [ ! -f /usr/src/linux/security/selinux/ss/ebitmap.c ]; then @@ -39,12 +40,14 @@ pkg_setup() { eerror "for selinux-small to compile. If the link is correct, the" eerror "kernel sources may be damaged or incomplete, and will need to" eend 1 "be remerged. Please fix and retry." + die "Bad /usr/src/linux symlink." fi if [ -z "`use pam`" ]; then eerror "pam is missing from your USE. Currently selinux requires pam." eerror "Please add pam, so all programs work correctly. A pam-less" eend 1 "install will probably be supported in the future." + die "Missing USE=\"selinux\"." fi } |