From patchwork Wed Sep 7 16:40:15 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Zygmunt Krynicki X-Patchwork-Id: 3967 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 66CF523E54 for ; Wed, 7 Sep 2011 16:48:21 +0000 (UTC) Received: from mail-fx0-f52.google.com (mail-fx0-f52.google.com [209.85.161.52]) by fiordland.canonical.com (Postfix) with ESMTP id 4ECC3A180E2 for ; Wed, 7 Sep 2011 16:48:21 +0000 (UTC) Received: by fxd18 with SMTP id 18so1024246fxd.11 for ; Wed, 07 Sep 2011 09:48:21 -0700 (PDT) Received: by 10.223.4.133 with SMTP id 5mr548343far.81.1315414100962; Wed, 07 Sep 2011 09:48:20 -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.152.11.8 with SMTP id m8cs146152lab; Wed, 7 Sep 2011 09:48:20 -0700 (PDT) Received: by 10.216.71.5 with SMTP id q5mr5359983wed.4.1315414099959; Wed, 07 Sep 2011 09:48:19 -0700 (PDT) Received: from indium.canonical.com (indium.canonical.com [91.189.90.7]) by mx.google.com with ESMTPS id u11si941721wec.49.2011.09.07.09.48.19 (version=TLSv1/SSLv3 cipher=OTHER); Wed, 07 Sep 2011 09:48:19 -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 1R1LIQ-0004yJ-SE for ; Wed, 07 Sep 2011 16:48:18 +0000 Received: from ackee.canonical.com (localhost [127.0.0.1]) by ackee.canonical.com (Postfix) with ESMTP id 7FE21E1759 for ; Wed, 7 Sep 2011 16:40:15 +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: 237 X-Launchpad-Notification-Type: branch-revision To: Linaro Patch Tracker From: noreply@launchpad.net Subject: [Branch ~linaro-validation/lava-server/trunk] Rev 237: Fix django-debian settings template verification Message-Id: <20110907164015.1626.91129.launchpad@ackee.canonical.com> Date: Wed, 07 Sep 2011 16:40:15 -0000 Reply-To: noreply@launchpad.net Sender: bounces@canonical.com Errors-To: bounces@canonical.com Precedence: bulk X-Generated-By: Launchpad (canonical.com); Revision="13861"; Instance="initZopeless config overlay" X-Launchpad-Hash: 071f71fdc52a7ab5994392bd032ca5bf24173fa1 ------------------------------------------------------------ revno: 237 committer: Zygmunt Krynicki branch nick: trunk timestamp: Wed 2011-09-07 18:39:04 +0200 message: Fix django-debian settings template verification modified: lava_server/manage.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/manage.py' --- lava_server/manage.py 2011-09-07 16:19:46 +0000 +++ lava_server/manage.py 2011-09-07 16:39:04 +0000 @@ -90,10 +90,8 @@ else: settings_module = "lava_server.settings.development" if self.args.instance: - if not os.path.isdir(self.args.instance): - self.parser.error("Specified instance does not exsit") - os.environ["DJANGO_DEBIAN_SETTINGS_TEMPLATE"] = ( - self.args.instance_template.format(instance=self.args.instance)) + ddst = self.args.instance_template.format(instance=self.args.instance) + os.environ["DJANGO_DEBIAN_SETTINGS_TEMPLATE"] = ddst settings = __import__(settings_module, fromlist=['']) from django.core.management import execute_manager execute_manager(settings, ['lava-server'] + self.args.command)