From patchwork Mon May 7 23:43:10 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael-Doyle Hudson X-Patchwork-Id: 8437 Return-Path: X-Original-To: patchwork@peony.canonical.com Delivered-To: patchwork@peony.canonical.com Received: from fiordland.canonical.com (fiordland.canonical.com [91.189.94.145]) by peony.canonical.com (Postfix) with ESMTP id AAAD023E23 for ; Mon, 7 May 2012 23:43:13 +0000 (UTC) Received: from mail-yx0-f180.google.com (mail-yx0-f180.google.com [209.85.213.180]) by fiordland.canonical.com (Postfix) with ESMTP id 59C35A187AB for ; Mon, 7 May 2012 23:43:13 +0000 (UTC) Received: by yenl4 with SMTP id l4so5949740yen.11 for ; Mon, 07 May 2012 16:43:12 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20120113; h=x-forwarded-to:x-forwarded-for:delivered-to:received-spf :content-type:mime-version:x-launchpad-project:x-launchpad-branch :x-launchpad-message-rationale:x-launchpad-branch-revision-number :x-launchpad-notification-type:to:from:subject:message-id:date :reply-to:sender:errors-to:precedence:x-generated-by :x-launchpad-hash:x-gm-message-state; bh=ZPYRDcKxBqgJyXrexbWJj0em8ONy988P1gpzFk5XGVY=; b=IMy/miymatxy6Z/pqessGlNaJWTCfPPOQ75dUPhBSDmRxraYihI4Lja/oYPZZzSZI2 dGHb7EYNQJXKrjHEAoljgwcEuyBhLaV/P8Zr8bhdE8Razxy15hThmtPnyo4GoPQmSGdA 74gAzVW6rqDqYcF2H0PV10bPX//pG397zRZ5xUWCkpk4aQ3+xSQGSEc3VJ+XDH1blIv/ 6Wmu9JNQXLSZpAMbJPVtk50IFD2NVG/rvxinwTSSyJEd9SLEn+bdvE4jzt7tPneW8xkB WipWH3cvaBfhOcewZ7OqtSDxVYWks9jN8tFV4w2EM7cBckrJvkd8SkxeunNSA4eSZzwN lNTA== Received: by 10.50.51.163 with SMTP id l3mr9473954igo.3.1336434192659; Mon, 07 May 2012 16:43:12 -0700 (PDT) X-Forwarded-To: linaro-patchwork@canonical.com X-Forwarded-For: patch@linaro.org linaro-patchwork@canonical.com Delivered-To: patches@linaro.org Received: by 10.231.73.147 with SMTP id q19csp161481ibj; Mon, 7 May 2012 16:43:11 -0700 (PDT) Received: by 10.180.99.72 with SMTP id eo8mr38639852wib.10.1336434190869; Mon, 07 May 2012 16:43:10 -0700 (PDT) Received: from indium.canonical.com (indium.canonical.com. [91.189.90.7]) by mx.google.com with ESMTPS id l2si11649766wiw.41.2012.05.07.16.43.10 (version=TLSv1/SSLv3 cipher=OTHER); Mon, 07 May 2012 16:43:10 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of bounces@canonical.com designates 91.189.90.7 as permitted sender) client-ip=91.189.90.7; Authentication-Results: mx.google.com; spf=pass (google.com: best guess record for domain of bounces@canonical.com designates 91.189.90.7 as permitted sender) smtp.mail=bounces@canonical.com Received: from ackee.canonical.com ([91.189.89.26]) by indium.canonical.com with esmtp (Exim 4.71 #1 (Debian)) id 1SRXaA-0003n3-7J for ; Mon, 07 May 2012 23:43:10 +0000 Received: from ackee.canonical.com (localhost [127.0.0.1]) by ackee.canonical.com (Postfix) with ESMTP id 296F9E088E for ; Mon, 7 May 2012 23:43:10 +0000 (UTC) MIME-Version: 1.0 X-Launchpad-Project: lava-scheduler X-Launchpad-Branch: ~linaro-validation/lava-scheduler/trunk X-Launchpad-Message-Rationale: Subscriber X-Launchpad-Branch-Revision-Number: 167 X-Launchpad-Notification-Type: branch-revision To: Linaro Patch Tracker From: noreply@launchpad.net Subject: [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> Date: Mon, 07 May 2012 23:43:10 -0000 Reply-To: noreply@launchpad.net Sender: bounces@canonical.com Errors-To: bounces@canonical.com Precedence: bulk X-Generated-By: Launchpad (canonical.com); Revision="15195"; Instance="launchpad-lazr.conf" X-Launchpad-Hash: a69f7359fb2fe1bb4fb68ca518132b4ea031761c X-Gm-Message-State: ALoCoQn2pxcgO5LLezWn1FACJ/ijcSYd+LbDtsbyT12FrqzW4jVt3LS6wJSlYoQ3v9WAFue2jYkC 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 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 === 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'