openstack/devstack
Code Issues Proposed changes

Merge "Add $TOP_DIR to the path when calling tools' scripts"

Browse Source
This commit is contained in:
Jenkins 2014-06-17 19:51:27 +00:00 committed by Gerrit Code Review
commit 5bdabd070b
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
stack.sh
View File

@ -553,14 +553,14 @@ if [[ -n "$LOGFILE" ]]; then
exec 3>&1 exec 3>&1
if [[ "$VERBOSE" == "True" ]]; then if [[ "$VERBOSE" == "True" ]]; then
# Set fd 1 and 2 to write the log file # Set fd 1 and 2 to write the log file
exec 1> >( ./tools/outfilter.py -v -o "${LOGFILE}" ) 2>&1 exec 1> >( $TOP_DIR/tools/outfilter.py -v -o "${LOGFILE}" ) 2>&1
# Set fd 6 to summary log file # Set fd 6 to summary log file
exec 6> >( ./tools/outfilter.py -o "${SUMFILE}" ) exec 6> >( $TOP_DIR/tools/outfilter.py -o "${SUMFILE}" )
else else
# Set fd 1 and 2 to primary logfile # Set fd 1 and 2 to primary logfile
exec 1> >( ./tools/outfilter.py -o "${LOGFILE}" ) 2>&1 exec 1> >( $TOP_DIR/tools/outfilter.py -o "${LOGFILE}" ) 2>&1
# Set fd 6 to summary logfile and stdout # Set fd 6 to summary logfile and stdout
exec 6> >( ./tools/outfilter.py -v -o "${SUMFILE}" >&3 ) exec 6> >( $TOP_DIR/tools/outfilter.py -v -o "${SUMFILE}" >&3 )
fi fi
echo_summary "stack.sh log $LOGFILE" echo_summary "stack.sh log $LOGFILE"
@ -577,7 +577,7 @@ else
exec 1>/dev/null 2>&1 exec 1>/dev/null 2>&1
fi fi
# Always send summary fd to original stdout # Always send summary fd to original stdout
exec 6> >( ./tools/outfilter.py -v >&3 ) exec 6> >( $TOP_DIR/tools/outfilter.py -v >&3 )
fi fi
# Set up logging of screen windows # Set up logging of screen windows