summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLiam R. Howlett <Liam.Howlett@WindRiver.com>2014-08-28 10:47:33 -0400
committerBruce Ashfield <bruce.ashfield@windriver.com>2014-09-04 15:28:06 -0400
commit65c6f6c3236b39e661578a5381d82175e331ac9f (patch)
tree8d72cc2aedd7f0b9e9b19e98ca170fa46e715055
parent355872c0b8e089cff033fcb346cd4866e10f7fe7 (diff)
downloadmeta-cloud-services-65c6f6c3236b39e661578a5381d82175e331ac9f.tar.gz
python-horizon: Fix whitespace in recipe.
The horizon recipe had lines running well over 80 characters and indentation that was not a multiple of 4. This patch fixes those issues. Signed-off-by: Liam R. Howlett <Liam.Howlett@WindRiver.com>
-rw-r--r--meta-openstack/recipes-devtools/python/python-horizon_git.bb22
1 files changed, 14 insertions, 8 deletions
diff --git a/meta-openstack/recipes-devtools/python/python-horizon_git.bb b/meta-openstack/recipes-devtools/python/python-horizon_git.bb
index 5ac5c14..6e0523a 100644
--- a/meta-openstack/recipes-devtools/python/python-horizon_git.bb
+++ b/meta-openstack/recipes-devtools/python/python-horizon_git.bb
@@ -62,17 +62,21 @@ do_install_append() {
62 sed -e "s:^LANGUAGE_CODE =.*:LANGUAGE_CODE = 'en-us':g" \ 62 sed -e "s:^LANGUAGE_CODE =.*:LANGUAGE_CODE = 'en-us':g" \
63 -i ${DASHBOARD_DIR}/settings.py 63 -i ${DASHBOARD_DIR}/settings.py
64 sed -e "s:^# from horizon.utils:from horizon.utils:g" \ 64 sed -e "s:^# from horizon.utils:from horizon.utils:g" \
65 ${DASHBOARD_DIR}/local/local_settings.py.example > ${DASHBOARD_DIR}/local/local_settings.py 65 ${DASHBOARD_DIR}/local/local_settings.py.example > \
66 ${DASHBOARD_DIR}/local/local_settings.py
66 sed -e "s:^# SECRET_KEY =:SECRET_KEY =:g" \ 67 sed -e "s:^# SECRET_KEY =:SECRET_KEY =:g" \
67 -i ${DASHBOARD_DIR}/local/local_settings.py 68 -i ${DASHBOARD_DIR}/local/local_settings.py
68 install -m 644 ${S}/manage.py ${DASHBOARD_DIR}/manage.py 69 install -m 644 ${S}/manage.py ${DASHBOARD_DIR}/manage.py
69 70
70 if ${@base_contains('DISTRO_FEATURES', 'sysvinit', 'true', 'false', d)}; then 71 if ${@base_contains('DISTRO_FEATURES', 'sysvinit', 'true', 'false', d)};
72 then
71 install -d ${D}${sysconfdir}/init.d 73 install -d ${D}${sysconfdir}/init.d
72 sed 's:@PYTHON_SITEPACKAGES@:${PYTHON_SITEPACKAGES_DIR}:' ${WORKDIR}/horizon.init >${WORKDIR}/horizon 74 sed 's:@PYTHON_SITEPACKAGES@:${PYTHON_SITEPACKAGES_DIR}:' \
75 ${WORKDIR}/horizon.init >${WORKDIR}/horizon
73 install -m 0755 ${WORKDIR}/horizon ${D}${sysconfdir}/init.d/horizon 76 install -m 0755 ${WORKDIR}/horizon ${D}${sysconfdir}/init.d/horizon
74 fi 77 fi
75 sed -i -e 's#%PYTHON_SITEPACKAGES%#${PYTHON_SITEPACKAGES_DIR}#g' ${D}${PYTHON_SITEPACKAGES_DIR}/horizon/test/settings.py 78 sed -i -e 's#%PYTHON_SITEPACKAGES%#${PYTHON_SITEPACKAGES_DIR}#g' \
79 ${D}${PYTHON_SITEPACKAGES_DIR}/horizon/test/settings.py
76 80
77 # no longer required. kept as reference. 81 # no longer required. kept as reference.
78 # mv ${D}${datadir}/bin ${DASHBOARD_DIR}/bin 82 # mv ${D}${datadir}/bin ${DASHBOARD_DIR}/bin
@@ -85,14 +89,16 @@ do_install_append() {
85 cp ${S}/manage.py ${DASHBOARD_SHARE_DIR} 89 cp ${S}/manage.py ${DASHBOARD_SHARE_DIR}
86 90
87 install -D -m 644 ${WORKDIR}/local_settings.py \ 91 install -D -m 644 ${WORKDIR}/local_settings.py \
88 ${DASHBOARD_CONF_DIR}/local_settings.py 92 ${DASHBOARD_CONF_DIR}/local_settings.py
89 ln -fs ${sysconfdir}/openstack-dashboard/local_settings.py \ 93 ln -fs ${sysconfdir}/openstack-dashboard/local_settings.py \
90 ${DASHBOARD_SHARE_DIR}/openstack_dashboard/local/local_settings.py 94 ${DASHBOARD_SHARE_DIR}/openstack_dashboard/local/local_settings.py
91 95
92 install -D -m 644 ${WORKDIR}/openstack-dashboard-apache.conf \ 96 install -D -m 644 ${WORKDIR}/openstack-dashboard-apache.conf \
93 ${SYSCONF_DIR}/apache2/conf.d/openstack-dashboard-apache.conf 97 ${SYSCONF_DIR}/apache2/conf.d/openstack-dashboard-apache.conf
94 sed -i -e 's#%PYTHON_SITEPACKAGES%#${PYTHON_SITEPACKAGES_DIR}#' ${SYSCONF_DIR}/apache2/conf.d/openstack-dashboard-apache.conf 98 sed -i -e 's#%PYTHON_SITEPACKAGES%#${PYTHON_SITEPACKAGES_DIR}#' \
95 sed -i -e 's#%LIBDIR%#${libdir}#' ${SYSCONF_DIR}/apache2/conf.d/openstack-dashboard-apache.conf 99 ${SYSCONF_DIR}/apache2/conf.d/openstack-dashboard-apache.conf
100 sed -i -e 's#%LIBDIR%#${libdir}#' \
101 ${SYSCONF_DIR}/apache2/conf.d/openstack-dashboard-apache.conf
96 102
97 ln -fs openstack_dashboard/static ${DASHBOARD_SHARE_DIR}/static 103 ln -fs openstack_dashboard/static ${DASHBOARD_SHARE_DIR}/static
98 104