From patchwork Thu Dec 1 19:27:13 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Zygmunt Krynicki X-Patchwork-Id: 5425 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 51CB023E04 for ; Thu, 1 Dec 2011 19:27:16 +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 35B7DA18677 for ; Thu, 1 Dec 2011 19:27:16 +0000 (UTC) Received: by laah2 with SMTP id h2so1263474laa.11 for ; Thu, 01 Dec 2011 11:27:15 -0800 (PST) Received: by 10.152.110.130 with SMTP id ia2mr5767206lab.26.1322767635863; Thu, 01 Dec 2011 11:27:15 -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 h6cs82208lal; Thu, 1 Dec 2011 11:27:15 -0800 (PST) Received: by 10.204.148.67 with SMTP id o3mr8989663bkv.130.1322767634044; Thu, 01 Dec 2011 11:27:14 -0800 (PST) Received: from indium.canonical.com (indium.canonical.com. [91.189.90.7]) by mx.google.com with ESMTPS id tn2si9900889bkb.76.2011.12.01.11.27.13 (version=TLSv1/SSLv3 cipher=OTHER); Thu, 01 Dec 2011 11:27:14 -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 1RWCHp-00046S-AP for ; Thu, 01 Dec 2011 19:27:13 +0000 Received: from ackee.canonical.com (localhost [127.0.0.1]) by ackee.canonical.com (Postfix) with ESMTP id 43918E003E for ; Thu, 1 Dec 2011 19:27:13 +0000 (UTC) MIME-Version: 1.0 X-Launchpad-Project: lava-dispatcher X-Launchpad-Branch: ~linaro-validation/lava-dispatcher/trunk X-Launchpad-Message-Rationale: Subscriber X-Launchpad-Branch-Revision-Number: 171 X-Launchpad-Notification-Type: branch-revision To: Linaro Patch Tracker From: noreply@launchpad.net Subject: [Branch ~linaro-validation/lava-dispatcher/trunk] Rev 171: Automatically override configuration inside virtualenv Message-Id: <20111201192713.24836.14867.launchpad@ackee.canonical.com> Date: Thu, 01 Dec 2011 19:27:13 -0000 Reply-To: noreply@launchpad.net Sender: bounces@canonical.com Errors-To: bounces@canonical.com Precedence: bulk X-Generated-By: Launchpad (canonical.com); Revision="14414"; Instance="launchpad-lazr.conf" X-Launchpad-Hash: be1f97b26931eb9aba5448f620dba302d46a86fd ------------------------------------------------------------ revno: 171 committer: Zygmunt Krynicki branch nick: lava-dispatcher timestamp: Thu 2011-12-01 16:12:02 +0100 message: Automatically override configuration inside virtualenv modified: lava-dispatch --- lp:lava-dispatcher https://code.launchpad.net/~linaro-validation/lava-dispatcher/trunk You are subscribed to branch lp:lava-dispatcher. To unsubscribe from this branch go to https://code.launchpad.net/~linaro-validation/lava-dispatcher/trunk/+edit-subscription === modified file 'lava-dispatch' --- lava-dispatch 2011-11-28 20:13:34 +0000 +++ lava-dispatch 2011-12-01 15:12:02 +0000 @@ -33,7 +33,9 @@ parser.add_option( "--oob-fd", default=None, type=int, help="Write OOB data to this fd.") parser.add_option( - "--config-dir", default=None, help="XXX") + "--config-dir", + default=None if os.environ.get("VIRTUAL_ENV") is None else os.path.join(os.environ["VIRTUAL_ENV"], "etc", "lava-dispatcher"), + help="Configuration directory override (currently %default)") parser.add_option( "--validate", action='store_true', help="Just validate the job file, do not execute any steps.")