openstack
/
cinder
Code Issues Proposed changes

Merge "Add venv wrapper for check_uptodate.sh"

This commit is contained in:
Jenkins 2013-08-31 23:02:16 +00:00 committed by Gerrit Code Review
parent 5581cb3492 91e2466f2d
commit b67caf3256
2 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
run_tests.sh
View File

@ -227,7 +227,7 @@ fi
if [ $just_pep8 -eq 1 ]; then
run_pep8
bash ./tools/conf/check_uptodate.sh
${wrapper} bash ./tools/conf/check_uptodate.sh
exit
fi
@ -245,6 +245,6 @@ run_tests
if [ -z "$testrargs" ]; then
if [ $no_pep8 -eq 0 ]; then
run_pep8
bash ./tools/conf/check_uptodate.sh
${wrapper} bash ./tools/conf/check_uptodate.sh
fi
fi

3
tools/conf/check_uptodate.sh
View File

@ -4,7 +4,8 @@ CFGFILE=cinder.conf.sample
tools/conf/generate_sample.sh -o $TEMPDIR
if ! diff $TEMPDIR/$CFGFILE etc/cinder/$CFGFILE
then
echo "E: cinder.conf.sample is not up to date, please run tools/conf/generate_sample.sh"
echo "E: cinder.conf.sample is not up to date, please run tools/conf/generate_sample.sh in venv"
echo "E: e.g. \$ source .venv/bin/activate; tools/conf/generate_sample.sh"
rm -rf $TEMPDIR
exit 42
fi