Attachment 150813 Details for Bug 233027 – cvs diff template-db2ldif.in and its commit message

cvs diff template-db2ldif.in and its commit message

db2ldif.diff (text/plain), 2.27 KB, created by Noriko Hosoi on 2007-03-24 00:52:47 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Noriko Hosoi

Created: 2007-03-24 00:52:47 UTC

Size: 2.27 KB

patch

obsolete

>Index: template-db2ldif.in
>===================================================================
>RCS file: /cvs/dirsec/ldapserver/ldap/admin/src/scripts/template-db2ldif.in,v
>retrieving revision 1.6
>diff -t -w -U4 -r1.6 template-db2ldif.in
>--- template-db2ldif.in	20 Mar 2007 01:15:32 -0000	1.6
>+++ template-db2ldif.in	24 Mar 2007 00:49:01 -0000
>@@ -13,43 +13,45 @@
> export SHLIB_PATH
> 
> make_ldiffile()
> {
>-    nobe=0
>+    be=""
>     while [ "$1" != "" ]
>     do
>-        if [ "$1" = '-a' ]; then
>+        if [ "$1" = "-a" ]; then
>             shift
>             echo $1
>             return 1
>-        elif [ "$1" = '-n' ]; then
>+        elif [ "$1" = "-n" ]; then
>             shift
>             if [ "$be" = "" ]; then
>                 be="$1"
>             else
>                 tmpbe="$be"
>                 be="${tmpbe}-$1"
>             fi
>-        elif [ "$1" = '-s' ]; then
>+        elif [ "$1" = "-s" ]; then
>             shift
>+            if [ "$1" != "" ]; then
>             rdn=`echo $1 | awk -F, '{print $1}'`
>             rdnval=`echo $rdn | awk -F= '{print $2}'`
>             if [ "$be" = "" ]; then
>                 be="$rdnval"
>             else
>                 tmpbe="$be"
>                 be="${tmpbe}-$rdnval"
>             fi
>-        elif [ "$1" = '-M' ]; then
>-            nobe=1
>+            fi
>+        elif [ "$1" = "-M" ]; then
>+            be=""
>         fi
>         shift
>     done
> 
>-    if [ $nobe -eq 0 ]; then
>-        echo {{LDIF-DIR}}/{{SERV-ID}}-${be}-`date +%Y_%m_%d_%H%M%S`.ldif
>-    else
>+    if [ "$be" = "" ]; then
>         echo {{LDIF-DIR}}/{{SERV-ID}}-`date +%Y_%m_%d_%H%M%S`.ldif
>+    else
>+        echo {{LDIF-DIR}}/{{SERV-ID}}-${be}-`date +%Y_%m_%d_%H%M%S`.ldif
>     fi
>     return 0
> }
> 
>
>Resolves: #233027
>Summary: make db2bak.pl & db2ldif.pl user more user-friendly (Comment #8)
>Fixed problem: the command line fails to generate an output file name
>when an empty suffix is passed like this: db2ldif -s ""
>CVS: ----------------------------------------------------------------------
>CVS: Modified Files:
>CVS:    template-db2ldif.in
>CVS: ----------------------------------------------------------------------
>Checking in template-db2ldif.in;
>/cvs/dirsec/ldapserver/ldap/admin/src/scripts/template-db2ldif.in,v  <--  template-db2ldif.in
>new revision: 1.7; previous revision: 1.6
>done
>

Actions: View

Attachments on bug 233027: 150442 | 150443 | 150447 | 150451 | 150717 | 150813 | 151242