summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRobin H. Johnson <robbat2@gentoo.org>2005-09-06 02:47:11 +0000
committerRobin H. Johnson <robbat2@gentoo.org>2005-09-06 02:47:11 +0000
commit9dab47c25e65822879c23fd68d6b420986dc0bae (patch)
tree27f063f9a731c0552b87e3056a92f4d5ece0b64a /net-nds
parentStable on SPARC. (diff)
downloadgentoo-2-9dab47c25e65822879c23fd68d6b420986dc0bae.tar.gz
gentoo-2-9dab47c25e65822879c23fd68d6b420986dc0bae.tar.bz2
gentoo-2-9dab47c25e65822879c23fd68d6b420986dc0bae.zip
Get rid of message complaining that /etc/openldap/slapd.conf might not exist.
(Portage version: 2.0.51.22-r2)
Diffstat (limited to 'net-nds')
-rw-r--r--net-nds/openldap/ChangeLog5
-rw-r--r--net-nds/openldap/openldap-2.2.28.ebuild7
2 files changed, 9 insertions, 3 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/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)"