openstack/devstack
Code Issues Proposed changes

Merge "Clean up automated changes to requirements"

Browse Source
This commit is contained in:
Jenkins 2013-09-25 17:12:13 +00:00 committed by Gerrit Code Review
commit 0c43c6a7b8
1 changed files with 9 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
functions
View File

@ -1226,7 +1226,10 @@ function setup_develop() {
echo "cd $REQUIREMENTS_DIR; $SUDO_CMD python update.py $project_dir"
# Don't update repo if local changes exist
if (cd $project_dir && git diff --quiet); then
(cd $project_dir && git diff --quiet)
local update_requirements=$?
if [ $update_requirements -eq 0 ]; then
(cd $REQUIREMENTS_DIR; \
$SUDO_CMD python update.py $project_dir)
fi
@ -1234,6 +1237,11 @@ function setup_develop() {
pip_install -e $project_dir
# ensure that further actions can do things like setup.py sdist
safe_chown -R $STACK_USER $1/*.egg-info
# Undo requirements changes, if we made them
if [ $update_requirements -eq 0 ]; then
(cd $project_dir && git checkout -- requirements.txt test-requirements.txt setup.py)
fi
}