| 1 |
vapier 08/05/05 03:54:32 |
| 2 |
|
| 3 |
Modified: openrc-0.2.2.ebuild openrc-9999.ebuild |
| 4 |
openrc-0.2.3.ebuild |
| 5 |
Log: |
| 6 |
dont use find for net.* symlinks #219822 |
| 7 |
(Portage version: 2.2_pre5, RepoMan options: --force) |
| 8 |
|
| 9 |
Revision Changes Path |
| 10 |
1.6 sys-apps/openrc/openrc-0.2.2.ebuild |
| 11 |
|
| 12 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-apps/openrc/openrc-0.2.2.ebuild?rev=1.6&view=markup |
| 13 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-apps/openrc/openrc-0.2.2.ebuild?rev=1.6&content-type=text/plain |
| 14 |
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-apps/openrc/openrc-0.2.2.ebuild?r1=1.5&r2=1.6 |
| 15 |
|
| 16 |
Index: openrc-0.2.2.ebuild |
| 17 |
=================================================================== |
| 18 |
RCS file: /var/cvsroot/gentoo-x86/sys-apps/openrc/openrc-0.2.2.ebuild,v |
| 19 |
retrieving revision 1.5 |
| 20 |
retrieving revision 1.6 |
| 21 |
diff -u -r1.5 -r1.6 |
| 22 |
--- openrc-0.2.2.ebuild 19 Apr 2008 20:40:51 -0000 1.5 |
| 23 |
+++ openrc-0.2.2.ebuild 5 May 2008 03:54:32 -0000 1.6 |
| 24 |
@@ -1,6 +1,6 @@ |
| 25 |
# Copyright 1999-2008 Gentoo Foundation |
| 26 |
# Distributed under the terms of the GNU General Public License v2 |
| 27 |
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/openrc/openrc-0.2.2.ebuild,v 1.5 2008/04/19 20:40:51 vapier Exp $ |
| 28 |
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/openrc/openrc-0.2.2.ebuild,v 1.6 2008/05/05 03:54:32 vapier Exp $ |
| 29 |
|
| 30 |
inherit eutils flag-o-matic multilib toolchain-funcs |
| 31 |
|
| 32 |
@@ -158,7 +158,8 @@ |
| 33 |
fi |
| 34 |
|
| 35 |
# force net init.d scripts into symlinks |
| 36 |
- for f in $(find "${ROOT}"/etc/init.d/ -name 'net.*') ; do |
| 37 |
+ for f in "${ROOT}"/etc/init.d/net.* ; do |
| 38 |
+ [[ -e ${f} ]] || continue # catch net.* not matching anything |
| 39 |
[[ ${f} == *.openrc.bak ]] && continue |
| 40 |
if [[ ! -L ${f} ]] ; then |
| 41 |
elog "Moved net service '${f##*/}' to '${f##*/}.openrc.bak' to force a symlink." |
| 42 |
|
| 43 |
|
| 44 |
|
| 45 |
1.33 sys-apps/openrc/openrc-9999.ebuild |
| 46 |
|
| 47 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-apps/openrc/openrc-9999.ebuild?rev=1.33&view=markup |
| 48 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-apps/openrc/openrc-9999.ebuild?rev=1.33&content-type=text/plain |
| 49 |
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-apps/openrc/openrc-9999.ebuild?r1=1.32&r2=1.33 |
| 50 |
|
| 51 |
Index: openrc-9999.ebuild |
| 52 |
=================================================================== |
| 53 |
RCS file: /var/cvsroot/gentoo-x86/sys-apps/openrc/openrc-9999.ebuild,v |
| 54 |
retrieving revision 1.32 |
| 55 |
retrieving revision 1.33 |
| 56 |
diff -u -r1.32 -r1.33 |
| 57 |
--- openrc-9999.ebuild 19 Apr 2008 20:40:51 -0000 1.32 |
| 58 |
+++ openrc-9999.ebuild 5 May 2008 03:54:32 -0000 1.33 |
| 59 |
@@ -1,6 +1,6 @@ |
| 60 |
# Copyright 1999-2008 Gentoo Foundation |
| 61 |
# Distributed under the terms of the GNU General Public License v2 |
| 62 |
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/openrc/openrc-9999.ebuild,v 1.32 2008/04/19 20:40:51 vapier Exp $ |
| 63 |
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/openrc/openrc-9999.ebuild,v 1.33 2008/05/05 03:54:32 vapier Exp $ |
| 64 |
|
| 65 |
inherit eutils flag-o-matic multilib toolchain-funcs |
| 66 |
|
| 67 |
@@ -158,7 +158,8 @@ |
| 68 |
fi |
| 69 |
|
| 70 |
# force net init.d scripts into symlinks |
| 71 |
- for f in $(find "${ROOT}"/etc/init.d/ -name 'net.*') ; do |
| 72 |
+ for f in "${ROOT}"/etc/init.d/net.* ; do |
| 73 |
+ [[ -e ${f} ]] || continue # catch net.* not matching anything |
| 74 |
[[ ${f} == *.openrc.bak ]] && continue |
| 75 |
if [[ ! -L ${f} ]] ; then |
| 76 |
elog "Moved net service '${f##*/}' to '${f##*/}.openrc.bak' to force a symlink." |
| 77 |
|
| 78 |
|
| 79 |
|
| 80 |
1.2 sys-apps/openrc/openrc-0.2.3.ebuild |
| 81 |
|
| 82 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-apps/openrc/openrc-0.2.3.ebuild?rev=1.2&view=markup |
| 83 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-apps/openrc/openrc-0.2.3.ebuild?rev=1.2&content-type=text/plain |
| 84 |
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-apps/openrc/openrc-0.2.3.ebuild?r1=1.1&r2=1.2 |
| 85 |
|
| 86 |
Index: openrc-0.2.3.ebuild |
| 87 |
=================================================================== |
| 88 |
RCS file: /var/cvsroot/gentoo-x86/sys-apps/openrc/openrc-0.2.3.ebuild,v |
| 89 |
retrieving revision 1.1 |
| 90 |
retrieving revision 1.2 |
| 91 |
diff -u -r1.1 -r1.2 |
| 92 |
--- openrc-0.2.3.ebuild 29 Apr 2008 19:18:37 -0000 1.1 |
| 93 |
+++ openrc-0.2.3.ebuild 5 May 2008 03:54:32 -0000 1.2 |
| 94 |
@@ -1,6 +1,6 @@ |
| 95 |
# Copyright 1999-2008 Gentoo Foundation |
| 96 |
# Distributed under the terms of the GNU General Public License v2 |
| 97 |
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/openrc/openrc-0.2.3.ebuild,v 1.1 2008/04/29 19:18:37 cardoe Exp $ |
| 98 |
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/openrc/openrc-0.2.3.ebuild,v 1.2 2008/05/05 03:54:32 vapier Exp $ |
| 99 |
|
| 100 |
inherit eutils flag-o-matic multilib toolchain-funcs |
| 101 |
|
| 102 |
@@ -158,7 +158,8 @@ |
| 103 |
fi |
| 104 |
|
| 105 |
# force net init.d scripts into symlinks |
| 106 |
- for f in $(find "${ROOT}"/etc/init.d/ -name 'net.*') ; do |
| 107 |
+ for f in "${ROOT}"/etc/init.d/net.* ; do |
| 108 |
+ [[ -e ${f} ]] || continue # catch net.* not matching anything |
| 109 |
[[ ${f} == *.openrc.bak ]] && continue |
| 110 |
if [[ ! -L ${f} ]] ; then |
| 111 |
elog "Moved net service '${f##*/}' to '${f##*/}.openrc.bak' to force a symlink." |
| 112 |
|
| 113 |
|
| 114 |
|
| 115 |
-- |
| 116 |
gentoo-commits@l.g.o mailing list |
Archives