[Pkg-openldap-devel] [openldap] 09/39: r1672 at pulsar: torsten | 2005-04-04 11:10:45 +0200 Output the diagnostics of the failed slapadd when trying to fix the LDIF

[Timo Aaltonen]

This is an automated email from the git hooks/post-receive script.

tjaalton-guest pushed a commit to annotated tag 2.2.23-2
in repository openldap.

commit 571744faac49f5c1056766c32ff0c2662cc3c7a8
Author: Torsten Landschoff <torsten at debian.org>
Date:   Mon Apr 4 09:09:46 2005 +0000

     r1672 at pulsar:  torsten | 2005-04-04 11:10:45 +0200
     Output the diagnostics of the failed slapadd when trying to fix the LDIF
---
 debian/slapd.scripts-common |   10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/debian/slapd.scripts-common b/debian/slapd.scripts-common
index 80dd05a..c8e3bda 100644
--- a/debian/slapd.scripts-common
+++ b/debian/slapd.scripts-common
@@ -169,8 +169,14 @@ load_databases() {							# {{{
 			rm -f "$dbdir"/*
 			failed=
 			echo -n "fixing" >&2
-			corrective_ldif_filter < "$file" | \
-				slapadd -b "$suffix" 2>/dev/null || failed=1
+			# This only works because we used capture_diag
+			# above already and the FD for the capture is 
+			# already assigned in the master shell. There 
+			# should be a cleaner way for this...
+			# -- Torsten
+			corrective_ldif_filter < "$file" \
+				| capture_diagnostics slapadd -b "$suffix" \
+				|| failed=1
 			echo -n ", " >&2
 		fi
 		if [ "$failed" ]; then

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-openldap/openldap.git