diff options
| author |   Doug Goldstein <cardoe@gentoo.org> | 2008-04-15 16:39:51 +0000 |
|---|---|---|
| committer | Doug Goldstein <cardoe@gentoo.org> | 2008-04-15 16:39:51 +0000 |
| commit | e70d037ee74f43bcef8094524e7f12e526cae29e (patch) | |
| tree | c922cbcb8a0428302645d2d3edbdf0b9e9661824 /sys-apps/openrc | |
| parent | Added xdg-utils instead of hard-coded www browser and editor. Various (diff) | |
| download | gentoo-2-e70d037ee74f43bcef8094524e7f12e526cae29e.tar.gz gentoo-2-e70d037ee74f43bcef8094524e7f12e526cae29e.tar.bz2 gentoo-2-e70d037ee74f43bcef8094524e7f12e526cae29e.zip | |
fix bug #217764
(Portage version: 2.1.5_rc3)
Diffstat (limited to 'sys-apps/openrc')
| -rw-r--r-- | sys-apps/openrc/ChangeLog | 6 | ||||
| -rw-r--r-- | sys-apps/openrc/openrc-0.2.1-r1.ebuild | 3 | ||||
| -rw-r--r-- | sys-apps/openrc/openrc-0.2.1-r2.ebuild | 3 | ||||
| -rw-r--r-- | sys-apps/openrc/openrc-9999.ebuild | 3 |
4 files changed, 11 insertions, 4 deletions
diff --git a/sys-apps/openrc/ChangeLog b/sys-apps/openrc/ChangeLog index 7d50975ebaf8..55499ed9de63 100644 --- a/sys-apps/openrc/ChangeLog +++ b/sys-apps/openrc/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for sys-apps/openrc # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/sys-apps/openrc/ChangeLog,v 1.29 2008/04/15 05:59:46 cardoe Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-apps/openrc/ChangeLog,v 1.30 2008/04/15 16:39:51 cardoe Exp $ + + 15 Apr 2008; Doug Goldstein <cardoe@gentoo.org> openrc-0.2.1-r1.ebuild, + openrc-0.2.1-r2.ebuild, openrc-9999.ebuild: + fix bug #217764 *openrc-0.2.1-r2 (15 Apr 2008) diff --git a/sys-apps/openrc/openrc-0.2.1-r1.ebuild b/sys-apps/openrc/openrc-0.2.1-r1.ebuild index 1cec5f266c0e..8f4fe61bf5f4 100644 --- a/sys-apps/openrc/openrc-0.2.1-r1.ebuild +++ b/sys-apps/openrc/openrc-0.2.1-r1.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2008 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sys-apps/openrc/openrc-0.2.1-r1.ebuild,v 1.7 2008/04/15 16:01:12 cardoe Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-apps/openrc/openrc-0.2.1-r1.ebuild,v 1.8 2008/04/15 16:39:51 cardoe Exp $ inherit eutils flag-o-matic multilib toolchain-funcs @@ -159,6 +159,7 @@ pkg_preinst() { # force net init.d scripts into symlinks for f in $(find "${ROOT}"/etc/init.d/ -name 'net.*') ; do + [[ ${f} =~ openrc.bak$ ]] && continue if [[ ! -L ${f} ]] ; then elog "Moved net service '${f##*/}' to '${f##*/}.openrc.bak' to force a symlink." elog "You should delete '${f##*/}.openrc.bak' if you don't need it." diff --git a/sys-apps/openrc/openrc-0.2.1-r2.ebuild b/sys-apps/openrc/openrc-0.2.1-r2.ebuild index 9c81a97b390d..d036b16ffbb2 100644 --- a/sys-apps/openrc/openrc-0.2.1-r2.ebuild +++ b/sys-apps/openrc/openrc-0.2.1-r2.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2008 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sys-apps/openrc/openrc-0.2.1-r2.ebuild,v 1.2 2008/04/15 16:01:12 cardoe Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-apps/openrc/openrc-0.2.1-r2.ebuild,v 1.3 2008/04/15 16:39:51 cardoe Exp $ inherit eutils flag-o-matic multilib toolchain-funcs @@ -163,6 +163,7 @@ pkg_preinst() { # force net init.d scripts into symlinks for f in $(find "${ROOT}"/etc/init.d/ -name 'net.*') ; do + [[ ${f} =~ openrc.bak$ ]] && continue if [[ ! -L ${f} ]] ; then elog "Moved net service '${f##*/}' to '${f##*/}.openrc.bak' to force a symlink." elog "You should delete '${f##*/}.openrc.bak' if you don't need it." diff --git a/sys-apps/openrc/openrc-9999.ebuild b/sys-apps/openrc/openrc-9999.ebuild index 1de12ee0e349..2fc069a0f512 100644 --- a/sys-apps/openrc/openrc-9999.ebuild +++ b/sys-apps/openrc/openrc-9999.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2008 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sys-apps/openrc/openrc-9999.ebuild,v 1.27 2008/04/15 16:01:12 cardoe Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-apps/openrc/openrc-9999.ebuild,v 1.28 2008/04/15 16:39:51 cardoe Exp $ inherit eutils flag-o-matic multilib toolchain-funcs @@ -157,6 +157,7 @@ pkg_preinst() { # force net init.d scripts into symlinks for f in $(find "${ROOT}"/etc/init.d/ -name 'net.*') ; do + [[ ${f} =~ openrc.bak$ ]] && continue if [[ ! -L ${f} ]] ; then elog "Moved net service '${f##*/}' to '${f##*/}.openrc.bak' to force a symlink." elog "You should delete '${f##*/}.openrc.bak' if you don't need it." |