diff options
| author |   Robin H. Johnson <robbat2@gentoo.org> | 2005-09-06 02:47:11 +0000 |
|---|---|---|
| committer | Robin H. Johnson <robbat2@gentoo.org> | 2005-09-06 02:47:11 +0000 |
| commit | adc588488311970fe4bccdfffd91934fd49c1f3b (patch) | |
| tree | 61238b6240c9066d6c6241d425bba93bf258363a /net-nds | |
| parent | Stable on SPARC. (diff) | |
| download | historical-adc588488311970fe4bccdfffd91934fd49c1f3b.tar.gz historical-adc588488311970fe4bccdfffd91934fd49c1f3b.tar.bz2 historical-adc588488311970fe4bccdfffd91934fd49c1f3b.zip | |
Get rid of message complaining that /etc/openldap/slapd.conf might not exist.
Package-Manager: portage-2.0.51.22-r2
Diffstat (limited to 'net-nds')
| -rw-r--r-- | net-nds/openldap/ChangeLog | 5 | ||||
| -rw-r--r-- | net-nds/openldap/Manifest | 4 | ||||
| -rw-r--r-- | net-nds/openldap/openldap-2.2.28.ebuild | 7 |
3 files changed, 11 insertions, 5 deletions
diff --git a/net-nds/openldap/ChangeLog b/net-nds/openldap/ChangeLog index dcabedebb9c9..8c470f0433e7 100644 --- a/net-nds/openldap/ChangeLog +++ b/net-nds/openldap/ChangeLog @@ -1,6 +1,9 @@ # ChangeLog for net-nds/openldap # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/net-nds/openldap/ChangeLog,v 1.131 2005/09/05 08:19:31 robbat2 Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-nds/openldap/ChangeLog,v 1.132 2005/09/06 02:47:11 robbat2 Exp $ + + 06 Sep 2005; Robin H. Johnson <robbat2@gentoo.org> openldap-2.2.28.ebuild: + Get rid of message complaining that /etc/openldap/slapd.conf might not exist. 05 Sep 2005; Robin H. Johnson <robbat2@gentoo.org> openldap-2.2.28.ebuild: Move to stable x86 now, after much testing. Pay attension to the upgrade diff --git a/net-nds/openldap/Manifest b/net-nds/openldap/Manifest index 666879e9dbbc..45475cc83638 100644 --- a/net-nds/openldap/Manifest +++ b/net-nds/openldap/Manifest @@ -9,14 +9,14 @@ MD5 47247dbac20cbf48c08404fca5b51b7f openldap-2.2.26.ebuild 9741 MD5 2adaddb98fafad5e590a07c8e96cf5a8 openldap-2.1.30-r4.ebuild 7316 MD5 769def42704f755b038c1f8e2f50022d openldap-2.2.27-r1.ebuild 12783 MD5 c69442b890a343d621a6923d0ddfd369 openldap-2.2.23-r1.ebuild 8802 -MD5 957c7800cd9c44228199404a227d07d1 openldap-2.2.28.ebuild 12779 +MD5 a94afa6773aec79f92503fc9bb93d8ee openldap-2.2.28.ebuild 12862 MD5 90ad9b62db369bad1f15a4401267e438 openldap-2.2.23.ebuild 7820 MD5 b33684a7371eb8e18a8cc35c381cd469 openldap-2.2.19.ebuild 7963 MD5 231a7a229c627e9ce2bdccb29c1a55e9 openldap-2.2.14.ebuild 7255 MD5 89c1b232c5c53b96513eaf580cc4f5c2 openldap-2.1.30.ebuild 7368 MD5 c11fbc4ba7824ae4f171eee66dc52e85 openldap-2.1.26.ebuild 7096 MD5 d03b4b8965dada31e3357108cce8e0a2 openldap-2.1.30-r1.ebuild 7382 -MD5 0ffe642b6c245f9c420e5328719baced ChangeLog 24049 +MD5 8b60c6810fc9d013a7829aefef1ecd73 ChangeLog 24207 MD5 b0d485ea1a51fb83c70daedef2599272 metadata.xml 279 MD5 7901f04890caac3b418942143b60b284 openldap-2.1.27-r1.ebuild 7452 MD5 b230f9445ab2e9b4ae10beb130d329db openldap-2.2.26-r1.ebuild 10639 diff --git a/net-nds/openldap/openldap-2.2.28.ebuild b/net-nds/openldap/openldap-2.2.28.ebuild index 34895d0257eb..26049808be36 100644 --- a/net-nds/openldap/openldap-2.2.28.ebuild +++ b/net-nds/openldap/openldap-2.2.28.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/net-nds/openldap/openldap-2.2.28.ebuild,v 1.2 2005/09/05 08:19:31 robbat2 Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-nds/openldap/openldap-2.2.28.ebuild,v 1.3 2005/09/06 02:47:11 robbat2 Exp $ inherit flag-o-matic toolchain-funcs eutils multilib @@ -74,7 +74,10 @@ openldap_upgrade_warning() { pkg_setup() { # grab lines - openldap_datadirs="$(awk '{if($1 == "directory") print $2 }' /etc/openldap/slapd.conf)" + openldap_datadirs="" + if [ -f ${ROOT}/etc/openldap/slapd.conf ]; then + openldap_datadirs="$(awk '{if($1 == "directory") print $2 }' ${ROOT}/etc/openldap/slapd.conf)" + fi datafiles="" for d in $openldap_datadirs; do datafiles="${datafiles} $(ls $d/*db*} 2>/dev/null)" |