From patchwork Tue Nov 29 09:37:16 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Zygmunt Krynicki X-Patchwork-Id: 5367 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 29CCE23E17 for ; Tue, 29 Nov 2011 09:43:54 +0000 (UTC) Received: from mail-lpp01m010-f52.google.com (mail-lpp01m010-f52.google.com [209.85.215.52]) by fiordland.canonical.com (Postfix) with ESMTP id 08811A18071 for ; Tue, 29 Nov 2011 09:43:53 +0000 (UTC) Received: by mail-lpp01m010-f52.google.com with SMTP id h2so1235698laa.11 for ; Tue, 29 Nov 2011 01:43:53 -0800 (PST) Received: by 10.152.135.225 with SMTP id pv1mr30686729lab.19.1322559833925; Tue, 29 Nov 2011 01:43:53 -0800 (PST) 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.41.198 with SMTP id h6cs32913lal; Tue, 29 Nov 2011 01:43:53 -0800 (PST) Received: by 10.227.204.197 with SMTP id fn5mr26794219wbb.15.1322559437253; Tue, 29 Nov 2011 01:37:17 -0800 (PST) Received: from indium.canonical.com (indium.canonical.com. [91.189.90.7]) by mx.google.com with ESMTPS id s7si18434683wiw.5.2011.11.29.01.37.17 (version=TLSv1/SSLv3 cipher=OTHER); Tue, 29 Nov 2011 01:37:17 -0800 (PST) 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 1RVK7o-0007Hn-Vf for ; Tue, 29 Nov 2011 09:37:16 +0000 Received: from ackee.canonical.com (localhost [127.0.0.1]) by ackee.canonical.com (Postfix) with ESMTP id E6F8FE0435 for ; Tue, 29 Nov 2011 09:37:16 +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: 305 X-Launchpad-Notification-Type: branch-revision To: Linaro Patch Tracker From: noreply@launchpad.net Subject: [Branch ~linaro-validation/lava-server/trunk] Rev 305: Fix default instance computation code Message-Id: <20111129093716.13982.83204.launchpad@ackee.canonical.com> Date: Tue, 29 Nov 2011 09:37:16 -0000 Reply-To: noreply@launchpad.net Sender: bounces@canonical.com Errors-To: bounces@canonical.com Precedence: bulk X-Generated-By: Launchpad (canonical.com); Revision="14399"; Instance="launchpad-lazr.conf" X-Launchpad-Hash: 0154db433c893c0f12ed5ff111e7de0d6e63a07b ------------------------------------------------------------ revno: 305 committer: Zygmunt Krynicki branch nick: lava-server timestamp: Tue 2011-11-22 02:09:28 +0100 message: Fix default instance computation code 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-11-22 00:51:50 +0000 +++ lava_server/manage.py 2011-11-22 01:09:28 +0000 @@ -75,10 +75,17 @@ action="store_true", default=True, help="Use production settings (default)") + try: + instance_name = os.environ["LAVA_INSTANCE"] + except KeyError: + try: + instance_name = os.path.basename(os.environ["VIRTUAL_ENV"]) + except KeyError: + instance_name = None group.add_argument( "-i", "--instance", action="store", - default=os.environ.get('LAVA_INSTANCE', os.path.basename(os.environ.get('VIRTUAL_ENV', '') or None)), + default=instance_name, help="Use the specified instance (works only with --production, default %(default)s)") group.add_argument( "-I", "--instance-template",