| 1 |
robbat2 09/12/03 02:47:21 |
| 2 |
|
| 3 |
Modified: ChangeLog openldap-2.4.19-r1.ebuild |
| 4 |
Log: |
| 5 |
Bug #291821 redux Cleanup the sys-libs/db check more to NOT fire when there are no database files present. |
| 6 |
(Portage version: 2.2_rc54/cvs/Linux x86_64) |
| 7 |
|
| 8 |
Revision Changes Path |
| 9 |
1.363 net-nds/openldap/ChangeLog |
| 10 |
|
| 11 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-nds/openldap/ChangeLog?rev=1.363&view=markup |
| 12 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-nds/openldap/ChangeLog?rev=1.363&content-type=text/plain |
| 13 |
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-nds/openldap/ChangeLog?r1=1.362&r2=1.363 |
| 14 |
|
| 15 |
Index: ChangeLog |
| 16 |
=================================================================== |
| 17 |
RCS file: /var/cvsroot/gentoo-x86/net-nds/openldap/ChangeLog,v |
| 18 |
retrieving revision 1.362 |
| 19 |
retrieving revision 1.363 |
| 20 |
diff -p -w -b -B -u -u -r1.362 -r1.363 |
| 21 |
--- ChangeLog 28 Nov 2009 22:25:36 -0000 1.362 |
| 22 |
+++ ChangeLog 3 Dec 2009 02:47:19 -0000 1.363 |
| 23 |
@@ -1,6 +1,11 @@ |
| 24 |
# ChangeLog for net-nds/openldap |
| 25 |
# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2 |
| 26 |
-# $Header: /var/cvsroot/gentoo-x86/net-nds/openldap/ChangeLog,v 1.362 2009/11/28 22:25:36 robbat2 Exp $ |
| 27 |
+# $Header: /var/cvsroot/gentoo-x86/net-nds/openldap/ChangeLog,v 1.363 2009/12/03 02:47:19 robbat2 Exp $ |
| 28 |
+ |
| 29 |
+ 03 Dec 2009; Robin H. Johnson <robbat2@g.o> |
| 30 |
+ openldap-2.4.19-r1.ebuild: |
| 31 |
+ Bug #291821 redux Cleanup the sys-libs/db check more to NOT fire when |
| 32 |
+ there are no database files present. |
| 33 |
|
| 34 |
28 Nov 2009; Robin H. Johnson <robbat2@g.o> |
| 35 |
openldap-2.4.19-r1.ebuild: |
| 36 |
|
| 37 |
|
| 38 |
|
| 39 |
1.8 net-nds/openldap/openldap-2.4.19-r1.ebuild |
| 40 |
|
| 41 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-nds/openldap/openldap-2.4.19-r1.ebuild?rev=1.8&view=markup |
| 42 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-nds/openldap/openldap-2.4.19-r1.ebuild?rev=1.8&content-type=text/plain |
| 43 |
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-nds/openldap/openldap-2.4.19-r1.ebuild?r1=1.7&r2=1.8 |
| 44 |
|
| 45 |
Index: openldap-2.4.19-r1.ebuild |
| 46 |
=================================================================== |
| 47 |
RCS file: /var/cvsroot/gentoo-x86/net-nds/openldap/openldap-2.4.19-r1.ebuild,v |
| 48 |
retrieving revision 1.7 |
| 49 |
retrieving revision 1.8 |
| 50 |
diff -p -w -b -B -u -u -r1.7 -r1.8 |
| 51 |
--- openldap-2.4.19-r1.ebuild 28 Nov 2009 22:25:36 -0000 1.7 |
| 52 |
+++ openldap-2.4.19-r1.ebuild 3 Dec 2009 02:47:19 -0000 1.8 |
| 53 |
@@ -1,6 +1,6 @@ |
| 54 |
# Copyright 1999-2009 Gentoo Foundation |
| 55 |
# Distributed under the terms of the GNU General Public License v2 |
| 56 |
-# $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 $ |
| 57 |
+# $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 $ |
| 58 |
|
| 59 |
EAPI="2" |
| 60 |
inherit db-use eutils flag-o-matic multilib ssl-cert versionator toolchain-funcs |
| 61 |
@@ -64,6 +64,7 @@ openldap_find_versiontags() { |
| 62 |
|
| 63 |
# scan datadirs if we have a version tag |
| 64 |
openldap_found_tag=0 |
| 65 |
+ have_files=0 |
| 66 |
for each in ${openldap_datadirs}; do |
| 67 |
CURRENT_TAGDIR=${ROOT}`echo ${each} | sed "s:\/::"` |
| 68 |
CURRENT_TAG=${CURRENT_TAGDIR}/${OPENLDAP_VERSIONTAG} |
| 69 |
@@ -82,10 +83,12 @@ openldap_find_versiontags() { |
| 70 |
|
| 71 |
OLD_MAJOR=`get_version_component_range 2-3 ${OLDPF}` |
| 72 |
|
| 73 |
+ [ `ls -a ${CURRENT_TAGDIR} | wc -l` -gt 5 ] && have_files=1 |
| 74 |
+ |
| 75 |
# are we on the same branch? |
| 76 |
if [ "${OLD_MAJOR}" != "${PV:0:3}" ] ; then |
| 77 |
ewarn " Versiontag doesn't match current major release!" |
| 78 |
- if [[ `ls -a ${CURRENT_TAGDIR} | wc -l` -gt 5 ]] ; then |
| 79 |
+ if [[ "${have_files}" == "1" ]] ; then |
| 80 |
eerror " Versiontag says other major and you (probably) have datafiles!" |
| 81 |
echo |
| 82 |
openldap_upgrade_howto |
| 83 |
@@ -97,7 +100,8 @@ openldap_find_versiontags() { |
| 84 |
fi |
| 85 |
else |
| 86 |
einfo " Non-tagged dir ${each}" |
| 87 |
- if [[ `ls -a ${each} | wc -l` > 5 ]] ; then |
| 88 |
+ [[ `ls -a ${each} | wc -l` > 5 ]] && have_files=1 |
| 89 |
+ if [[ "${have_files}" == "1" ]] ; then |
| 90 |
einfo " EEK! Non-empty non-tagged datadir, counting `ls -a ${each} | wc -l` files" |
| 91 |
echo |
| 92 |
|
| 93 |
@@ -120,7 +124,7 @@ openldap_find_versiontags() { |
| 94 |
|
| 95 |
# Now we must check for the major version of sys-libs/db linked against. |
| 96 |
SLAPD_PATH=${ROOT}/usr/$(get_libdir)/openldap/slapd |
| 97 |
- if [ -f "${SLAPD_PATH}" ]; then |
| 98 |
+ if [ "${have_files}" == "1" -a -f "${SLAPD_PATH}" ]; then |
| 99 |
OLDVER="$(/usr/bin/ldd ${SLAPD_PATH} \ |
| 100 |
| awk '/libdb-/{gsub("^libdb-","",$1);gsub(".so$","",$1);print $1}')" |
| 101 |
NEWVER="$(use berkdb && db_findver sys-libs/db)" |
Archives