Bug #291821 redux Cleanup the sys-libs/db check more to NOT fire when there are no database files present.

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

3 files changed, 16 insertions, 7 deletions

diff --git a/net-nds/openldap/ChangeLog b/net-nds/openldap/ChangeLog
index f8c0ef267840..acc4e2b31657 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.362 2009/11/28 22:25:36 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-nds/openldap/ChangeLog,v 1.363 2009/12/03 02:47:19 robbat2 Exp $
+
+  03 Dec 2009; Robin H. Johnson <robbat2@gentoo.org>
+  openldap-2.4.19-r1.ebuild:
+  Bug #291821 redux Cleanup the sys-libs/db check more to NOT fire when
+  there are no database files present.
 
   28 Nov 2009; Robin H. Johnson <robbat2@gentoo.org>
   openldap-2.4.19-r1.ebuild:
diff --git a/net-nds/openldap/Manifest b/net-nds/openldap/Manifest
index fcd68c29c4c9..5e1dd439fc87 100644
--- a/net-nds/openldap/Manifest
+++ b/net-nds/openldap/Manifest
@@ -27,7 +27,7 @@ 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 19354 RMD160 0fd6cca01157ed6602f99a9b36b8f6d48b4b81ee SHA1 a660a1b0cc72638f923c03653f10688c514f2a85 SHA256 2bb17cf5da01247270b9693145bd1355cc515ac3dbe1ec5c00312b6dfd6878e6
+EBUILD openldap-2.4.19-r1.ebuild 19492 RMD160 933dd4e96e5ef4a20be635c9c9fac6761dfa3306 SHA1 06b3b478685da922cfc8996e2266e508bc55ae3d SHA256 dc445998458fc86179e24dbb7066116a4494f4c2c1f5b96947b19f98e57c4ae7
 EBUILD openldap-2.4.19.ebuild 17501 RMD160 7058461881bc146836cba0a8e9f867a7fd8728bc SHA1 f27435f04fafbf477bbb23f3d67900aac4e1bfb7 SHA256 afa573819347dd063fe4f67fccd606110da567ba143fdf52f3800f1080c436ba
-MISC ChangeLog 62251 RMD160 eff5370daf634e15f262433c71c86c76c0c4ae9b SHA1 fe68d09a6da36e377b60d719d4f29d26fad41da1 SHA256 37ebff3beb6147e50adb526c282deffb25e7e47e3f752fac7fcd645d6c007c9a
+MISC ChangeLog 62445 RMD160 8708e41352d78a8527ec263b8e7f9e49493505b5 SHA1 ce1cb2135e84f04db22fb8cd60450632833b6b68 SHA256 92bc8f5d549d61a9714dacede5d2bc00bf916a6ca511c6f00c99f0b1515823e2
 MISC metadata.xml 493 RMD160 3fd70a0f5e5b400cce6f75e477c8c9eaf0244ff8 SHA1 324691bfdc993bd6de2fff7cbfc10cfad567d32d SHA256 d23200f9c2f9e95e5fa32808c597df2951cd5e88ca9c519c9d5186bc42b0981e
diff --git a/net-nds/openldap/openldap-2.4.19-r1.ebuild b/net-nds/openldap/openldap-2.4.19-r1.ebuild
index da59476c7574..eb7a56cf0d1d 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.7 2009/11/28 22:25:36 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-nds/openldap/openldap-2.4.19-r1.ebuild,v 1.8 2009/12/03 02:47:19 robbat2 Exp $
 
 EAPI="2"
 inherit db-use eutils flag-o-matic multilib ssl-cert versionator toolchain-funcs
@@ -64,6 +64,7 @@ openldap_find_versiontags() {
 
 	# scan datadirs if we have a version tag
 	openldap_found_tag=0
+	have_files=0
 	for each in ${openldap_datadirs}; do
 		CURRENT_TAGDIR=${ROOT}`echo ${each} | sed "s:\/::"`
 		CURRENT_TAG=${CURRENT_TAGDIR}/${OPENLDAP_VERSIONTAG}
@@ -82,10 +83,12 @@ openldap_find_versiontags() {
 
 				OLD_MAJOR=`get_version_component_range 2-3 ${OLDPF}`
 
+				[ `ls -a ${CURRENT_TAGDIR} | wc -l` -gt 5 ] && have_files=1
+
 				# are we on the same branch?
 				if [ "${OLD_MAJOR}" != "${PV:0:3}" ] ; then
 					ewarn "   Versiontag doesn't match current major release!"
-					if [[ `ls -a ${CURRENT_TAGDIR} | wc -l` -gt 5 ]] ; then
+					if [[ "${have_files}" == "1" ]] ; then
 						eerror "   Versiontag says other major and you (probably) have datafiles!"
 						echo
 						openldap_upgrade_howto
@@ -97,7 +100,8 @@ openldap_find_versiontags() {
 				fi
 			else
 				einfo "   Non-tagged dir ${each}"
-				if [[ `ls -a ${each} | wc -l` > 5 ]] ; then
+				[[ `ls -a ${each} | wc -l`  > 5 ]] && have_files=1
+				if [[ "${have_files}" == "1" ]] ; then
 					einfo "   EEK! Non-empty non-tagged datadir, counting `ls -a ${each} | wc -l` files"
 					echo
 
@@ -120,7 +124,7 @@ openldap_find_versiontags() {
 
 	# Now we must check for the major version of sys-libs/db linked against.
 	SLAPD_PATH=${ROOT}/usr/$(get_libdir)/openldap/slapd
-	if [ -f "${SLAPD_PATH}" ]; then
+	if [ "${have_files}" == "1" -a -f "${SLAPD_PATH}" ]; then
 		OLDVER="$(/usr/bin/ldd ${SLAPD_PATH} \
 			| awk '/libdb-/{gsub("^libdb-","",$1);gsub(".so$","",$1);print $1}')"
 		NEWVER="$(use berkdb && db_findver sys-libs/db)"