openstack
/
openstack-doc-tools
Code Issues Proposed changes

Address pep8 warning at autohelp-wrapper 

Change-Id: I7f44a6b47f933a01bfa5cea227988d4b17bc6a4d
This commit is contained in:
KATO Tomoyuki 2016-01-17 18:23:49 +09:00
parent 80a0206e8a
commit cc8d24c71b
1 changed files with 18 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
autogenerate_config_docs/autohelp-wrapper
View File

@ -22,7 +22,8 @@ AUTOHELP="python $HERE/autohelp.py"
EXTRACT_SWIFT="python $HERE/extract_swift_flags.py" EXTRACT_SWIFT="python $HERE/extract_swift_flags.py"
GITBASE=git://git.openstack.org/openstack GITBASE=git://git.openstack.org/openstack
GITPROJ=git://git.openstack.org/openstack GITPROJ=git://git.openstack.org/openstack
PROJECTS="aodh ceilometer cinder glance heat ironic keystone manila neutron nova sahara swift trove" PROJECTS="aodh ceilometer cinder glance heat ironic keystone manila \
neutron nova sahara swift trove"
MANUALS_PROJECTS="openstack-manuals oslo-incubator" MANUALS_PROJECTS="openstack-manuals oslo-incubator"
BRANCH=master BRANCH=master
FAST=0 FAST=0
@ -30,7 +31,7 @@ FAST=0
usage() { usage() {
echo "Wrapper for autohelp.py" echo "Wrapper for autohelp.py"
echo "Usage:" echo "Usage:"
echo " $(basename $0) [ OPTIONS ] update|docbook|rst|setup [ project1 ... ]" echo " $(basename $0) [ OPTIONS ] update|docbook|rst|setup [ project... ]"
echo echo
echo "Subcommands:" echo "Subcommands:"
echo " update: Update or create the flagmapping files" echo " update: Update or create the flagmapping files"
@ -180,7 +181,8 @@ if [ "$FAST" -eq 0 ] ; then
git checkout -b $BRANCH remotes/origin/$BRANCH git checkout -b $BRANCH remotes/origin/$BRANCH
fi fi
pip install -rrequirements.txt pip install -rrequirements.txt
[ -e "test-requirements.txt" ] && pip install -rtest-requirements.txt [ -e "test-requirements.txt" ] && \
pip install -rtest-requirements.txt
python setup.py install python setup.py install
popd popd
@ -189,7 +191,8 @@ if [ "$FAST" -eq 0 ] ; then
( (
cd $SOURCESDIR/$extra cd $SOURCESDIR/$extra
pip install -rrequirements.txt pip install -rrequirements.txt
[ -e "test-requirements.txt" ] && pip install -rtest-requirements.txt [ -e "test-requirements.txt" ] && \
pip install -rtest-requirements.txt
python setup.py install python setup.py install
) )
done < $MAPPINGS_DIR/$project.extra_repos done < $MAPPINGS_DIR/$project.extra_repos
@ -220,8 +223,11 @@ for project in $PROJECTS; do
fi fi
if [ $package = "networking_zvm" ]; then if [ $package = "networking_zvm" ]; then
package="neutron" package="neutron"
cp -r $SOURCESDIR/networking-zvm/neutron/plugins/zvm $SOURCESDIR/neutron/neutron/plugins cp -r $SOURCESDIR/networking-zvm/neutron/plugins/zvm \
cp -r $SOURCESDIR/networking-zvm/neutron/plugins/ml2/drivers/zvm $SOURCESDIR/neutron/neutron/plugins/ml2/drivers $SOURCESDIR/neutron/neutron/plugins
cp -r \
$SOURCESDIR/networking-zvm/neutron/plugins/ml2/drivers/zvm\
$SOURCESDIR/neutron/neutron/plugins/ml2/drivers
fi fi
extra_flags="$extra_flags -i $SOURCESDIR/$extra/$package" extra_flags="$extra_flags -i $SOURCESDIR/$extra/$package"
done < $MAPPINGS_DIR/$project.extra_repos done < $MAPPINGS_DIR/$project.extra_repos
@ -232,21 +238,24 @@ for project in $PROJECTS; do
case $ACTION in case $ACTION in
update) update)
[ "$project" = "swift" ] && continue [ "$project" = "swift" ] && continue
$AUTOHELP update $project -i $SOURCESDIR/$project/$project $extra_flags $AUTOOPT $AUTOHELP update $project -i $SOURCESDIR/$project/$project \
$extra_flags $AUTOOPT
mv $project.flagmappings.new $project.flagmappings mv $project.flagmappings.new $project.flagmappings
;; ;;
docbook) docbook)
if [ "$project" = "swift" ]; then if [ "$project" = "swift" ]; then
$EXTRACT_SWIFT docbook -m $MANUALSREPO -s $SOURCESDIR/swift $EXTRACT_SWIFT docbook -m $MANUALSREPO -s $SOURCESDIR/swift
else else
$AUTOHELP docbook $project -i $SOURCESDIR/$project/$project $extra_flags $AUTOOPT $AUTOHELP docbook $project -i $SOURCESDIR/$project/$project \
$extra_flags $AUTOOPT
fi fi
;; ;;
rst) rst)
if [ "$project" = "swift" ]; then if [ "$project" = "swift" ]; then
$EXTRACT_SWIFT rst -m $MANUALSREPO -s $SOURCESDIR/swift $EXTRACT_SWIFT rst -m $MANUALSREPO -s $SOURCESDIR/swift
else else
$AUTOHELP rst $project -i $SOURCESDIR/$project/$project $extra_flags $AUTOOPT $AUTOHELP rst $project -i $SOURCESDIR/$project/$project \
$extra_flags $AUTOOPT
fi fi
;; ;;
esac esac