openstack
/
deb-designate-dashboard
Code Issues Proposed changes

handles static & enabled folder correctly 

* Correctly copy static files in /usr/share/openstack-dashboard, and run
    collect-static and compress after its done.
  * Do not install duplicate enabled file (Closes: #840638).

Change-Id: Ia258b2273475132fca4344407352c47c22a9d568
This commit is contained in:
Thomas Goirand 2016-10-14 23:35:37 +02:00
parent 6a93db824f
commit 7ddaf8acc6
4 changed files with 25 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
debian/changelog vendored
View File

@ -1,3 +1,11 @@
designate-dashboard (3.0.0-3) unstable; urgency=medium
* Correctly copy static files in /usr/share/openstack-dashboard, and run
collect-static and compress after its done.
* Do not install duplicate enabled file (Closes: #840638).
-- Thomas Goirand <zigo@debian.org> Fri, 14 Oct 2016 23:34:04 +0200
designate-dashboard (3.0.0-2) unstable; urgency=medium
* Do not copy stuff in /usr/share/openstack-dashboard (Closes: #839908).

2
debian/control vendored
View File

@ -5,7 +5,7 @@ Maintainer: PKG OpenStack <openstack-devel@lists.alioth.debian.org>
Uploaders: Thomas Goirand <zigo@debian.org>,
Build-Depends: debhelper (>= 9),
dh-python,
openstack-pkg-tools,
openstack-pkg-tools (>= 53~),
python-all,
python-pbr (>= 1.8),
python-setuptools,

10
debian/python-designate-dashboard.postinst vendored
View File

@ -4,10 +4,12 @@ set -e
if [ "$1" = "configure" ] ; then
# Compress the JS and CSS with python-compressor and python-lesscpy
#OSLO_PACKAGE_VERSION=2.0.0.0rc2 /usr/share/openstack-dashboard/manage.py compress --force
#rm /var/lib/openstack-dashboard/secret-key/.secret_key_store
#chown -R www-data /var/lib/openstack-dashboard/secret-key
echo "No static, so not compress or collecstatic with designate"
/usr/share/openstack-dashboard/manage.py collectstatic --clear --noinput
/usr/share/openstack-dashboard/manage.py compress --force
if [ -f /var/lib/openstack-dashboard/secret-key/.secret_key_store ]; then
rm /var/lib/openstack-dashboard/secret-key/.secret_key_store
fi
chown -R www-data /var/lib/openstack-dashboard/secret-key /var/lib/openstack-dashboard/static
fi
#DEBHELPER#

19
debian/rules vendored
View File

@ -1,9 +1,6 @@
#!/usr/bin/make -f
PYTHONS:=$(shell pyversions -vr)
include /usr/share/openstack-pkg-tools/pkgos.make
export OSLO_PACKAGE_VERSION=$(shell dpkg-parsechangelog | grep Version: | cut -d' ' -f2 | sed -e 's/^[[:digit:]]*://' -e 's/[-].*//' -e 's/~/.0/' | head -n 1)
%:
dh $@ --buildsystem=python_distutils --with python2
@ -29,10 +26,14 @@ override_dh_auto_install:
dh_auto_install -O--buildsystem=python_distutils
# Activates the designatedashboard plugin in Horizon
# designatedashboard/enabled/_7*
set -e ; for pyvers in $(PYTHONS); do \
mkdir -p $(CURDIR)/debian/python-designate-dashboard/usr/lib/python$$pyvers/dist-packages/openstack_dashboard/enabled ; \
cp $(CURDIR)/designatedashboard/enabled/_17* $(CURDIR)/debian/python-designate-dashboard/usr/lib/python$$pyvers/dist-packages/openstack_dashboard/enabled ; \
done
# designatedashboard/enabled/_17*
mkdir -p $(CURDIR)/debian/python-designate-dashboard/usr/lib/python2.7/dist-packages/openstack_dashboard/enabled ; \
mkdir -p $(CURDIR)/debian/python-designate-dashboard/usr/share/openstack-dashboard/openstack_dashboard/enabled
cp $(CURDIR)/designatedashboard/enabled/_17*.py $(CURDIR)/debian/python-designate-dashboard/usr/share/openstack-dashboard/openstack_dashboard/enabled
set -e ; for i in _1710_project_dns_panel_group.py _1721_dns_zones_panel.py _1722_dns_reversedns_panel.py ; do \
cp $(CURDIR)/designatedashboard/enabled/$$i $(CURDIR)/debian/python-designate-dashboard/usr/lib/python2.7/dist-packages/openstack_dashboard/enabled ; \
cp $(CURDIR)/designatedashboard/enabled/$$i $(CURDIR)/debian/python-designate-dashboard/usr/share/openstack-dashboard/openstack_dashboard/enabled ; \
done
# Copy static files
mkdir -p $(CURDIR)/debian/python-designate-dashboard/usr/share/openstack-dashboard/openstack_dashboard/static
cp -auxf designatedashboard/static/designatedashboard $(CURDIR)/debian/python-designate-dashboard/usr/share/openstack-dashboard/openstack_dashboard/static