From patchwork Mon May 7 03:47:11 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: 8418 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 2036123E23 for ; Mon, 7 May 2012 03:47:15 +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 DE2BFA18683 for ; Mon, 7 May 2012 03:47:14 +0000 (UTC) Received: by yenl4 with SMTP id l4so4799063yen.11 for ; Sun, 06 May 2012 20:47:14 -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=SSm4Cbszigge9HxoOaf2juasUlykk6pf+eMSb6VSlwY=; b=MFZupB69bThBg4b2AW+Y8+tSUEOqx0l2cDM9X8JxfjMR7ZNFyWyX3E1A/f30D84rft S3EiJXrV423yJ7/uzXo8cPOlngt+k2jsio1gNG5WgpBJsgyvky2PM3Yhd5IpDXdorvv2 Segg2ahLlBb5P0exDNxlDpXcONfzfTpqFKrLkcT55KKowcGbfXG0MImAUmzmZP6O0of6 z10m/ttaV9eXBKFQjix9jcnJNkmmpRWPDgzjiyykDK/aQnIuuRHi3Jy6E7bJASyssC9+ nxGJckK9aXdlxKmuSldcqNPOrPcDo3KXqa1w9LyzgHmsBa3u6rJj+XjgP6dxM/Afa4mF fDYA== Received: by 10.42.139.9 with SMTP id e9mr2317356icu.43.1336362434277; Sun, 06 May 2012 20:47:14 -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 q19csp99672ibj; Sun, 6 May 2012 20:47:13 -0700 (PDT) Received: by 10.216.137.22 with SMTP id x22mr903891wei.69.1336362432055; Sun, 06 May 2012 20:47:12 -0700 (PDT) Received: from indium.canonical.com (indium.canonical.com. [91.189.90.7]) by mx.google.com with ESMTPS id em16si7850986wid.16.2012.05.06.20.47.11 (version=TLSv1/SSLv3 cipher=OTHER); Sun, 06 May 2012 20:47:12 -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 1SREul-0000D3-HH for ; Mon, 07 May 2012 03:47:11 +0000 Received: from ackee.canonical.com (localhost [127.0.0.1]) by ackee.canonical.com (Postfix) with ESMTP id 75AA7E002E for ; Mon, 7 May 2012 03:47:11 +0000 (UTC) MIME-Version: 1.0 X-Launchpad-Project: lava-server X-Launchpad-Branch: ~linaro-validation/lava-server/trunk X-Launchpad-Message-Rationale: Subscriber X-Launchpad-Branch-Revision-Number: 366 X-Launchpad-Notification-Type: branch-revision To: Linaro Patch Tracker From: noreply@launchpad.net Subject: [Branch ~linaro-validation/lava-server/trunk] Rev 366: more django 1.4ness: admin needs to be in STATICFILES_PREPEND_LABEL_APPS iff we are running befor... Message-Id: <20120507034711.18134.96733.launchpad@ackee.canonical.com> Date: Mon, 07 May 2012 03:47:11 -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: 8f832a8c2df37baef946503330ffc522230ec2ca X-Gm-Message-State: ALoCoQlQAkx6rz2QKxR49kWA6jJ1EaRduwLQb2MArPXXoSpuh8MaVZDKQu+tS6ZTZyHrOuIJs4GR ------------------------------------------------------------ revno: 366 committer: Michael Hudson-Doyle branch nick: trunk timestamp: Mon 2012-05-07 15:45:39 +1200 message: more django 1.4ness: admin needs to be in STATICFILES_PREPEND_LABEL_APPS iff we are running before 1.4 modified: lava_server/settings/common.py --- lp:lava-server https://code.launchpad.net/~linaro-validation/lava-server/trunk You are subscribed to branch lp:lava-server. To unsubscribe from this branch go to https://code.launchpad.net/~linaro-validation/lava-server/trunk/+edit-subscription === modified file 'lava_server/settings/common.py' --- lava_server/settings/common.py 2012-05-07 02:58:11 +0000 +++ lava_server/settings/common.py 2012-05-07 03:45:39 +0000 @@ -69,10 +69,14 @@ "static", ) +import django + STATICFILES_PREPEND_LABEL_APPS = [ - "django.contrib.admin", ] +if django.VERSION < (1, 4): + STATICFILES_PREPEND_LABEL_APPS.append("django.contrib.admin") + # URL that handles the media served from MEDIA_ROOT. Make sure to use a # trailing slash if there is a path component (optional in other cases). # Examples: "http://media.lawrence.com", "http://example.com/media/"