#109245 fixes dying on failure.

Package-Manager: portage-2.0.53_rc4

diff --git a/sys-apps/rsbac-admin/Manifest b/sys-apps/rsbac-admin/Manifest
index 5144c71412a878738ee9db0f1679e8ebe135416b..a93a085aab4cb2687a5aca64f7ad5c2eaa8de392 100644 (file)
--- a/sys-apps/rsbac-admin/Manifest
+++ b/sys-apps/rsbac-admin/Manifest
@@ -1,14 +1,14 @@
-MD5 6b79594e93eecd76a98fd248d9eb3ad8 rsbac-admin-1.2.3.ebuild 2229
-MD5 5de6566b7ccd0b03abe0b1f8e22b8c75 rsbac-admin-1.2.5.ebuild 1603
-MD5 9ba0cdc1f37fca8eee5d069870b6bb9c rsbac-admin-1.2.99.ebuild 2716
-MD5 2af626ad2bd32bd1a95f45b88c18f545 rsbac-admin-1.2.4.ebuild 2771
 MD5 cebe634dfeac6b2b8bb8d5a91ef40cbe ChangeLog 3481
-MD5 035ff78da2388cc0585f93ef2247332d metadata.xml 161
-MD5 0ebfdd628334dbf801142d2a5cd832c1 files/nsswitch.conf 469
-MD5 5bba238d756a6695447f1bb0264a01a3 files/rklogd.init 1014
-MD5 3b63c2f46e9c0531be23e630133fe6a7 files/rsbac.conf 209
-MD5 d41d8cd98f00b204e9800998ecf8427e files/digest-rsbac-admin-1.2.99 0
-MD5 ffea7c6daada6d0033ed3996d45fd7ca files/rsbac-bugfix-v1.2.3-5.diff 625
 MD5 5089c0e6bbae98d91f7e78a9450465e5 files/digest-rsbac-admin-1.2.3 71
 MD5 1b8e1b375f69babf1fd8b370c33aa4bf files/digest-rsbac-admin-1.2.4 71
 MD5 5b133f0238ddfd21834460d1b7ea1b99 files/digest-rsbac-admin-1.2.5 70
+MD5 d41d8cd98f00b204e9800998ecf8427e files/digest-rsbac-admin-1.2.99 0
+MD5 0ebfdd628334dbf801142d2a5cd832c1 files/nsswitch.conf 469
+MD5 5bba238d756a6695447f1bb0264a01a3 files/rklogd.init 1014
+MD5 ffea7c6daada6d0033ed3996d45fd7ca files/rsbac-bugfix-v1.2.3-5.diff 625
+MD5 3b63c2f46e9c0531be23e630133fe6a7 files/rsbac.conf 209
+MD5 035ff78da2388cc0585f93ef2247332d metadata.xml 161
+MD5 6b79594e93eecd76a98fd248d9eb3ad8 rsbac-admin-1.2.3.ebuild 2229
+MD5 2af626ad2bd32bd1a95f45b88c18f545 rsbac-admin-1.2.4.ebuild 2771
+MD5 9ed4eb52c06b058095b07abffe84e296 rsbac-admin-1.2.5.ebuild 1656
+MD5 9ba0cdc1f37fca8eee5d069870b6bb9c rsbac-admin-1.2.99.ebuild 2716

diff --git a/sys-apps/rsbac-admin/rsbac-admin-1.2.5.ebuild b/sys-apps/rsbac-admin/rsbac-admin-1.2.5.ebuild
index 08c6a84c35c0c4d664da9ddf50129180c96f3cb3..561ef234ea63adeef0e58127099780386b041cd0 100644 (file)
--- a/sys-apps/rsbac-admin/rsbac-admin-1.2.5.ebuild
+++ b/sys-apps/rsbac-admin/rsbac-admin-1.2.5.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/rsbac-admin/rsbac-admin-1.2.5.ebuild,v 1.1 2005/10/07 15:39:05 kang Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/rsbac-admin/rsbac-admin-1.2.5.ebuild,v 1.2 2005/10/14 11:30:23 kang Exp $
 
 inherit eutils
 
@@ -30,7 +30,7 @@ src_compile() {
        use pam && {
                rsbacmakeargs="${makeargs} pam nss"
        }
-       emake PREFIX=/usr ${rsbacmakeargs} || "cannot build (${rsbacmakeargs})"
+       emake PREFIX=/usr ${rsbacmakeargs} || die "cannot build (${rsbacmakeargs})"
 }
 
 src_install() {
@@ -39,7 +39,8 @@ src_install() {
        use pam && {
                rsbacinstallargs="${rsbacinstallargs} pam-install nss-install"
        }
-       make PREFIX=${D}/usr DESTDIR=${D} ${rsbacinstallargs}
+       make PREFIX=${D}/usr DESTDIR=${D} ${rsbacinstallargs} || \
+       die "cannot install (${rsbacinstallargs})"
        insinto /etc
        newins ${FILESDIR}/rsbac.conf rsbac.conf ${FILESDIR}/nsswitch.conf
        dodir /secoff