This is an automated email from the git hooks/post-receive script.
mreynolds pushed a change to branch master in repository 389-ds-base.
from f5e4b8a Issue 49210 - Fix regression when checking is password min age should be checked new 1b5a578 Issue 47662 - CLI args get removed
The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "adds" were already present in the repository and have only been added to this reference.
Summary of changes: ldap/admin/src/scripts/db2ldif.in | 3 ++- ldap/admin/src/scripts/ldif2db.in | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-)
This is an automated email from the git hooks/post-receive script.
mreynolds pushed a commit to branch master in repository 389-ds-base.
commit 1b5a578b4dd95a4188d7e5be984f13484b993ca2 Author: Mark Reynolds mreynolds@redhat.com Date: Mon Apr 10 14:55:55 2017 -0400
Issue 47662 - CLI args get removed
Bug Description. Regression from previous fix. The process to check unknown CLI options blows away the built-in arg list "$@"
Fix Description: Make a copy of $@, and use it as needed.
https://pagure.io/389-ds-base/issue/47662
Reviewed by: nhosoi(Thanks!) --- ldap/admin/src/scripts/db2ldif.in | 3 ++- ldap/admin/src/scripts/ldif2db.in | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-)
diff --git a/ldap/admin/src/scripts/db2ldif.in b/ldap/admin/src/scripts/db2ldif.in index 85854b3..08f30e4 100755 --- a/ldap/admin/src/scripts/db2ldif.in +++ b/ldap/admin/src/scripts/db2ldif.in @@ -130,6 +130,7 @@ do esac done
+ARGS=$@ shift $(($OPTIND - 1)) if [ $1 ] then @@ -156,7 +157,7 @@ fi servid=`normalize_server_id $initfile` . $initfile
-ldif_file=`make_ldiffile $@` +ldif_file=`make_ldiffile $ARGS` rn=$?
echo "Exported ldif file: $ldif_file" diff --git a/ldap/admin/src/scripts/ldif2db.in b/ldap/admin/src/scripts/ldif2db.in index f968303..20c7d46 100755 --- a/ldap/admin/src/scripts/ldif2db.in +++ b/ldap/admin/src/scripts/ldif2db.in @@ -87,6 +87,7 @@ then exit 1 fi
+ARGS=$@ shift $(($OPTIND - 1)) if [ $1 ] then @@ -106,7 +107,7 @@ fi
. $initfile
-handleopts $@ +handleopts $ARGS quiet=$? if [ $quiet -eq 0 ]; then echo importing data ...
389-commits@lists.fedoraproject.org