openstack/devstack
Code Issues Proposed changes

Guard for worlddump in case LOGDIR is undefined

Browse Source 
If LOGDIR is undefined, we'll end up calling worldump with the `-d` option but
pass in an empty string as the option value. This causes an argument parsing
error inside worlddump.

The proposed fix is to detect if LOGDIR is undefined, and if so, omit the `-d`
argument.

Change-Id: I77968849ebd3e3bebd2e5929b87b60fc1b6541bf
Closes-Bug: 1333321
This commit is contained in:
Rick Harris 2014-08-18 13:53:42 -05:00
parent a6a45467c4
commit 2696e5a067
1 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
stack.sh
View File

@ -631,8 +631,12 @@ function exit_trap {
if [[ $r -ne 0 ]]; then if [[ $r -ne 0 ]]; then
echo "Error on exit" echo "Error on exit"
if [[ -z $LOGDIR ]]; then
./tools/worlddump.py
else
./tools/worlddump.py -d $LOGDIR ./tools/worlddump.py -d $LOGDIR
fi fi
fi
exit $r exit $r
} }