improved getopt handling

git-svn-id: https://svn.apache.org/repos/asf/incubator/couchdb/trunk@667987 13f79535-47bb-0310-9956-ffa450edef68

1 files changed, 4 insertions, 1 deletions

diff --git a/bootstrap b/bootstrap
index e8e29fda4..eebc0b86d 100755
--- a/bootstrap
+++ b/bootstrap
@@ -253,9 +253,12 @@ EOF
 parse_script_option_list () {
     # Parse the script option list and take the appropriate action.
 
-    if test ! argument_list=`getopt vhC $@`; then
+    set +e
+    argument_list=`getopt vhC $@`
+    if test ! $? -eq 0; then
         display_error
     fi
+    set -e
     eval set -- "$argument_list"
     while [ $# -gt 0 ]; do
         case "$1" in