diff mbox

[Branch,~linaro-validation/lava-scheduler/trunk] Rev 167: move static files around to be in line with what django.contrib.staticfiles expects

Message ID 20120507234310.15164.66934.launchpad@ackee.canonical.com
State Accepted
Headers show

Commit Message

Michael-Doyle Hudson May 7, 2012, 11:43 p.m. UTC 
Merge authors:
  Michael Hudson-Doyle (mwhudson)
Related merge proposals:
  https://code.launchpad.net/~mwhudson/lava-scheduler/static-files-1.4-style/+merge/104867
  proposed by: Michael Hudson-Doyle (mwhudson)
  review: Approve - Zygmunt Krynicki (zkrynicki)
------------------------------------------------------------
revno: 167 [merge]
committer: Michael Hudson-Doyle <michael.hudson@linaro.org>
branch nick: trunk
timestamp: Tue 2012-05-08 11:41:14 +1200
message:
  move static files around to be in line with what django.contrib.staticfiles expects
added:
  lava_scheduler_app/static/lava_scheduler_app/
renamed:
  lava_scheduler_app/static/css/ => lava_scheduler_app/static/lava_scheduler_app/css/
  lava_scheduler_app/static/images/ => lava_scheduler_app/static/lava_scheduler_app/images/
  lava_scheduler_app/static/js/ => lava_scheduler_app/static/lava_scheduler_app/js/
modified:
  lava_scheduler_app/extension.py


--
lp:lava-scheduler
https://code.launchpad.net/~linaro-validation/lava-scheduler/trunk

You are subscribed to branch lp:lava-scheduler.
To unsubscribe from this branch go to https://code.launchpad.net/~linaro-validation/lava-scheduler/trunk/+edit-subscription
diff mbox

Patch

=== modified file 'lava_scheduler_app/extension.py'
--- lava_scheduler_app/extension.py	2012-03-27 05:41:09 +0000
+++ lava_scheduler_app/extension.py	2012-05-07 04:34:41 +0000
@@ -76,6 +76,9 @@ 
             'MIN_JOB_TIMEOUT': 24*60*60,
             }
         settings_module['SCHEDULER_DAEMON_OPTIONS'].update(from_module)
+        prepend_label_apps = settings_module.get('STATICFILES_PREPEND_LABEL_APPS', [])
+        if self.app_name in prepend_label_apps:
+            prepend_label_apps.remove(self.app_name)
 
     def contribute_to_settings_ex(self, settings_module, settings_object):
         super(SchedulerExtension, self).contribute_to_settings_ex(

=== added directory 'lava_scheduler_app/static/lava_scheduler_app'
=== renamed directory 'lava_scheduler_app/static/css' => 'lava_scheduler_app/static/lava_scheduler_app/css'
=== renamed directory 'lava_scheduler_app/static/images' => 'lava_scheduler_app/static/lava_scheduler_app/images'
=== renamed directory 'lava_scheduler_app/static/js' => 'lava_scheduler_app/static/lava_scheduler_app/js'