diff options
| author |   Diego Elio Pettenò <flameeyes@gentoo.org> | 2009-06-16 14:05:36 +0000 |
|---|---|---|
| committer | Diego Elio Pettenò <flameeyes@gentoo.org> | 2009-06-16 14:05:36 +0000 |
| commit | f3e686ff9ddaaf208ce8b8352645b299b2ee2c5d (patch) | |
| tree | 6d6207611703bff8c9ad3899f5ab71a741794339 | |
| parent | Masked new alpha release. Pay particular attention to the fully rewritten ALS... (diff) | |
| download | gentoo-2-f3e686ff9ddaaf208ce8b8352645b299b2ee2c5d.tar.gz gentoo-2-f3e686ff9ddaaf208ce8b8352645b299b2ee2c5d.tar.bz2 gentoo-2-f3e686ff9ddaaf208ce8b8352645b299b2ee2c5d.zip | |
Only install the powerfail init script if openrc is installed; this way it's not polluting the installation for baselayout 1 users. Closes bug #271480.
(Portage version: 2.2_rc33/cvs/Linux x86_64)
| -rw-r--r-- | sys-power/apcupsd/ChangeLog | 8 | ||||
| -rw-r--r-- | sys-power/apcupsd/apcupsd-3.14.6.ebuild | 7 |
2 files changed, 12 insertions, 3 deletions
diff --git a/sys-power/apcupsd/ChangeLog b/sys-power/apcupsd/ChangeLog index 5519fc56c709..cc5acbb28ba1 100644 --- a/sys-power/apcupsd/ChangeLog +++ b/sys-power/apcupsd/ChangeLog @@ -1,6 +1,12 @@ # ChangeLog for sys-power/apcupsd # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/sys-power/apcupsd/ChangeLog,v 1.48 2009/05/23 12:03:34 maekke Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-power/apcupsd/ChangeLog,v 1.49 2009/06/16 14:05:36 flameeyes Exp $ + + 16 Jun 2009; Diego E. Pettenò <flameeyes@gentoo.org> + apcupsd-3.14.6.ebuild: + Only install the powerfail init script if openrc is installed; this way + it's not polluting the installation for baselayout 1 users. Closes bug + #271480. 23 May 2009; Markus Meier <maekke@gentoo.org> apcupsd-3.14.5-r2.ebuild: amd64 stable, bug #255048 diff --git a/sys-power/apcupsd/apcupsd-3.14.6.ebuild b/sys-power/apcupsd/apcupsd-3.14.6.ebuild index 56e93859e753..d1c4d78f053c 100644 --- a/sys-power/apcupsd/apcupsd-3.14.6.ebuild +++ b/sys-power/apcupsd/apcupsd-3.14.6.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2009 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sys-power/apcupsd/apcupsd-3.14.6.ebuild,v 1.1 2009/05/16 20:50:46 flameeyes Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-power/apcupsd/apcupsd-3.14.6.ebuild,v 1.2 2009/06/16 14:05:36 flameeyes Exp $ WEBAPP_MANUAL_SLOT="yes" WEBAPP_OPTIONAL="yes" @@ -77,7 +77,10 @@ src_install() { rm "${D}"/etc/init.d/apcupsd newinitd "${FILESDIR}/${PN}.init.2" "${PN}" || die "newinitd failed" - newinitd "${FILESDIR}/${PN}.powerfail.init" "${PN}".powerfail || die "newinitd failed" + + if has_version sys-apps/openrc; then + newinitd "${FILESDIR}/${PN}.powerfail.init" "${PN}".powerfail || die "newinitd failed" + fi } pkg_postinst() { |