From: Gonéri Le Bouder <goneri.lebouder@enovance.com>
Date: Wed, 5 Mar 2014 19:59:01 +0000 (+0100)
Subject: set COMPRESS_OFFLINE=True
X-Git-Url: https://review.fuel-infra.org/gitweb?a=commitdiff_plain;h=c3f93f9a85732e563167dd870f54c8598e51b425;p=openstack-build%2Fhorizon-build.git

set COMPRESS_OFFLINE=True

(cherry picked from commit 7edeaf643caad09781ae964d64b50453059f1be8)

Rewritten-From: 0d14acce1f9c0cf5edfa705e062e8854386bfc07
---

diff --git a/xenial/debian/changelog b/xenial/debian/changelog
index 7df98f1..10ed204 100644
--- a/xenial/debian/changelog
+++ b/xenial/debian/changelog
@@ -4,6 +4,10 @@ horizon (2014.1~b2-1) experimental; urgency=low
   * Compress the CSS and JS during the postinst (Closes: #739698)
   * Add mysql in Uploaders
   * Bump standard version, no change needed
+  * Turns COMPRESS_OFFLINE to True since we now pre-compress the
+    CSS and the JS
+  * Add call "manage.py compress" with the --force parameter to avoid
+    a warning an harmless warning for the user.
 
   [ Thomas Goirand ]
   * New upstream release (Icehouse beta 1).
diff --git a/xenial/debian/openstack-dashboard.postinst b/xenial/debian/openstack-dashboard.postinst
index 8563d62..77a87c8 100644
--- a/xenial/debian/openstack-dashboard.postinst
+++ b/xenial/debian/openstack-dashboard.postinst
@@ -17,7 +17,7 @@ if [ "$1" = "configure" ] ; then
 	chown www-data:www-data /var/lib/openstack-dashboard/secret-key
 
     # Compress the JS and CSS with python-compressor and python-lesscpy
-	/usr/share/openstack-dashboard/manage.py compress
+	/usr/share/openstack-dashboard/manage.py compress --force
 fi
 
 #DEBHELPER#
diff --git a/xenial/debian/rules b/xenial/debian/rules
index c4d700a..e8db157 100755
--- a/xenial/debian/rules
+++ b/xenial/debian/rules
@@ -26,6 +26,7 @@ override_dh_auto_install:
 		$(CURDIR)/debian/tmp/etc/openstack-dashboard/local_settings.py
 	sed -i -e 's/SECRET_KEY = secret_key.generate_or_read_from_file(os.path.join(LOCAL_PATH,/SECRET_KEY = secret_key.generate_or_read_from_file(os.path.join("\/","var","lib","openstack-dashboard","secret-key",/' \
 		$(CURDIR)/debian/tmp/etc/openstack-dashboard/local_settings.py
+	echo "COMPRESS_OFFLINE=True" >> $(CURDIR)/debian/tmp/etc/openstack-dashboard/local_settings.py
 
 	cp $(CURDIR)/manage.py \
 		$(CURDIR)/debian/tmp/usr/share/openstack-dashboard/