Bug #295622: Try for a major improvement in the detection of an existing on-disk DB.

Package-Manager: portage-2.2_rc54/cvs/Linux x86_64

3 files changed, 19 insertions, 6 deletions

diff --git a/net-nds/openldap/ChangeLog b/net-nds/openldap/ChangeLog
index 2e61ab541ad6..e640ae329b17 100644
--- a/net-nds/openldap/ChangeLog
+++ b/net-nds/openldap/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for net-nds/openldap
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-nds/openldap/ChangeLog,v 1.365 2009/12/03 20:03:12 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-nds/openldap/ChangeLog,v 1.366 2009/12/04 20:46:19 robbat2 Exp $
+
+  04 Dec 2009; Robin H. Johnson <robbat2@gentoo.org>
+  openldap-2.4.19-r1.ebuild:
+  Bug #295622: Try for a major improvement in the detection of an existing
+  on-disk DB.
 
   03 Dec 2009; Robin H. Johnson <robbat2@gentoo.org>
   openldap-2.4.19.ebuild, openldap-2.4.19-r1.ebuild:
diff --git a/net-nds/openldap/Manifest b/net-nds/openldap/Manifest
index 568695a8bd1a..4b1160bd2c0f 100644
--- a/net-nds/openldap/Manifest
+++ b/net-nds/openldap/Manifest
@@ -27,7 +27,9 @@ EBUILD openldap-2.3.43.ebuild 17845 RMD160 14dc97d9b79dbde77f124eeeebd162b5ea612
 EBUILD openldap-2.4.16.ebuild 15152 RMD160 54d5cced13910c8f81edc117a3dfb8db86248341 SHA1 a590c2e7aaf4a04459a76e755d26cb3747156305 SHA256 053f2dff9a03af6d2994d61fe01f637245e09744d3fc3a0bd62c7630d7004783
 EBUILD openldap-2.4.17-r1.ebuild 17425 RMD160 520100a05855c69c52dc0f952de15aae52d897ea SHA1 1034ffe92aca9986e0161c4473d3fe2d514cfcfd SHA256 0c900a92d19fec9b5300afcde77cf4ea4eed34e62e46f22cf1df9474b6e8a7bf
 EBUILD openldap-2.4.17.ebuild 15151 RMD160 dda10856a90ba7ddc898aab52f0cce079f067827 SHA1 453df712daf1861d39463ad2d05e127d43b53443 SHA256 9d65d9e3cef1badbda001ff5e79216d896a3865634d56f2e9b04664306e0ed4d
-EBUILD openldap-2.4.19-r1.ebuild 19493 RMD160 a9ac466cc61682bfcf0d7c7ff63796b8018553f3 SHA1 bac6c67f20557bf46fd06d2fddb7fae8401840d2 SHA256 9fe06440c708bdccb21f7b2ff10b34d621f86cecd0568ab113d08dea0ae3adb1
+EBUILD openldap-2.4.19-r1.ebuild 19706 RMD160 6a7730a4d20ce9bbe7f2ac30929dd70e70b01d8d SHA1 d570a6a331b39044ad87372f178bab659349be3a SHA256 734e7a9bb9859bf081f0ac9a2edd580b1630f4e6b6684c04a9b219c945073dbf
 EBUILD openldap-2.4.19.ebuild 17502 RMD160 75f4e77016e7468df0871b1bb61399c43ddd9c7e SHA1 ea9ee6cbc3cb5785a780164d459c779dad6bd432 SHA256 d213f2d33e429530c86ec77ca4b0ba7a2b108368a9403f0d21e3b2794c1c0ca3
-MISC ChangeLog 62701 RMD160 d37c5e45725189233a2ffa755b2213efdd15c126 SHA1 985ba16de4d44270f176fed17f6e3e14ed8c993f SHA256 e65ec96da2de60f26beae6802fa5bcf252f71a5bea489f39502ca743f357bfa6
+MISC ChangeLog 62873 RMD160 6ce40f45f2484af82f66274e53543eef0f9997bb SHA1 5917d1be00d09a971e6e9f167a39178bd10646da SHA256 2c9fff4292b4f27bcf02cd7eb312188e320a7cdec8cd819ddfd0fcb8662ab32d
 MISC metadata.xml 493 RMD160 3fd70a0f5e5b400cce6f75e477c8c9eaf0244ff8 SHA1 324691bfdc993bd6de2fff7cbfc10cfad567d32d SHA256 d23200f9c2f9e95e5fa32808c597df2951cd5e88ca9c519c9d5186bc42b0981e
+MISC openldap-2.4.19.ebuild.orig 17502 RMD160 75f4e77016e7468df0871b1bb61399c43ddd9c7e SHA1 ea9ee6cbc3cb5785a780164d459c779dad6bd432 SHA256 d213f2d33e429530c86ec77ca4b0ba7a2b108368a9403f0d21e3b2794c1c0ca3
+MISC openldap-2.4.19.ebuild.rej 789 RMD160 e9a40b76078d1dd5460e5c8bc375cefcb44e02f9 SHA1 fd959e1c81e6fe3217be527ddbdf3aafabd0f101 SHA256 bbc9a34217c02a23b64f2112a8055869eb5534d0f5327b2c62f875fa179809fb
diff --git a/net-nds/openldap/openldap-2.4.19-r1.ebuild b/net-nds/openldap/openldap-2.4.19-r1.ebuild
index 45cd1be5c2b5..5fbc410c19e5 100644
--- a/net-nds/openldap/openldap-2.4.19-r1.ebuild
+++ b/net-nds/openldap/openldap-2.4.19-r1.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/net-nds/openldap/openldap-2.4.19-r1.ebuild,v 1.9 2009/12/03 20:02:00 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-nds/openldap/openldap-2.4.19-r1.ebuild,v 1.10 2009/12/04 20:46:19 robbat2 Exp $
 
 EAPI="2"
 inherit db-use eutils flag-o-matic multilib ssl-cert versionator toolchain-funcs
@@ -48,6 +48,11 @@ DEPEND="${RDEPEND}"
 OPENLDAP_VERSIONTAG=".version-tag"
 OPENLDAP_DEFAULTDIR_VERSIONTAG="/var/lib/openldap-data"
 
+openldap_filecount() {
+	local dir="$1"
+	find "${dir}" -type f ! -name '.*' ! -name 'DB_CONFIG.example' | wc -l
+}
+
 openldap_find_versiontags() {
 	# scan for all datadirs
 	openldap_datadirs=""
@@ -83,7 +88,7 @@ openldap_find_versiontags() {
 
 				OLD_MAJOR=`get_version_component_range 2-3 ${OLDPF}`
 
-				[ `ls -a ${CURRENT_TAGDIR} | wc -l` -gt 5 ] && have_files=1
+				[ $(openldap_filecount ${CURRENT_TAGDIR}) -gt 0 ] && have_files=1
 
 				# are we on the same branch?
 				if [ "${OLD_MAJOR}" != "${PV:0:3}" ] ; then
@@ -100,7 +105,7 @@ openldap_find_versiontags() {
 				fi
 			else
 				einfo "   Non-tagged dir ${each}"
-				[[ `ls -a ${each} | wc -l`  > 5 ]] && have_files=1
+				[ $(openldap_filecount ${each}) -gt 0 ] && have_files=1
 				if [[ "${have_files}" == "1" ]] ; then
 					einfo "   EEK! Non-empty non-tagged datadir, counting `ls -a ${each} | wc -l` files"
 					echo
@@ -121,6 +126,7 @@ openldap_find_versiontags() {
 			einfo
 		fi
 	done
+	[ "${have_files}" == "1" ] && einfo "DB files present" || einfo "No DB files present"
 
 	# Now we must check for the major version of sys-libs/db linked against.
 	SLAPD_PATH=${ROOT}/usr/$(get_libdir)/openldap/slapd