openstack/rally
Code Issues Proposed changes

Allow shell calls to fail around getopt checks

Browse Source 
Change-Id: I1c2c2752b7569e0f882c1fedff84daeb90df5f07
Closes-Bug: 1463468
This commit is contained in:
Albert White 2015-06-24 11:25:56 +01:00 committed by Andrey Kurilin
parent 48e8c56830
commit 0ac47fcd74
1 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
install_rally.sh
View File

@ -460,6 +460,7 @@ setup_rally_configuration () {
short_opts='d:vfsyhD:p:'
long_opts='target:,verbose,overwrite,system,yes,dbtype:,python:,db-user:,db-password:,db-host:,db-name:,help'
set +e
if [ "x$(getopt -T)" = 'x' ]; then
# GNU getopt
args=$(getopt --name "$PROG" --shell sh -l "$long_opts" -o "$short_opts" -- "$@")
@ -472,10 +473,11 @@ else
# old-style getopt, use compatibility syntax
args=$(getopt "$short_opts" "$@")
if [ $? -ne 0 ]; then
abort 1 "Type '$PROG --help' to get usage information."
abort 1 "Type '$PROG -h' to get usage information."
fi
eval set -- "$args"
fi
set -e
# Command line parsing
while true