openstack/devstack
Code Issues Proposed changes

Merge "Fix inverted conditionals in setup_develop"

Browse Source
This commit is contained in:
Jenkins 2014-03-11 20:01:35 +00:00 committed by Gerrit Code Review
commit 9ea10307b7
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
functions-common
View File

@ -1248,7 +1248,7 @@ function setup_develop {
# ``errexit`` requires us to trap the exit code when the repo is changed # ``errexit`` requires us to trap the exit code when the repo is changed
local update_requirements=$(cd $project_dir && git diff --exit-code >/dev/null || echo "changed") local update_requirements=$(cd $project_dir && git diff --exit-code >/dev/null || echo "changed")
if [[ $update_requirements = "changed" ]]; then if [[ $update_requirements != "changed" ]]; then
(cd $REQUIREMENTS_DIR; \ (cd $REQUIREMENTS_DIR; \
$SUDO_CMD python update.py $project_dir) $SUDO_CMD python update.py $project_dir)
fi fi
@ -1264,7 +1264,7 @@ function setup_develop {
# a variable that tells us whether or not we should UNDO the requirements # a variable that tells us whether or not we should UNDO the requirements
# changes (this will be set to False in the OpenStack ci gate) # changes (this will be set to False in the OpenStack ci gate)
if [ $UNDO_REQUIREMENTS = "True" ]; then if [ $UNDO_REQUIREMENTS = "True" ]; then
if [[ $update_requirements = "changed" ]]; then if [[ $update_requirements != "changed" ]]; then
(cd $project_dir && git reset --hard) (cd $project_dir && git reset --hard)
fi fi
fi fi