From patchwork Fri Oct 14 03:17:13 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Spring Zhang X-Patchwork-Id: 4670 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 313AE23E51 for ; Fri, 14 Oct 2011 03:17:18 +0000 (UTC) Received: from mail-ey0-f180.google.com (mail-ey0-f180.google.com [209.85.215.180]) by fiordland.canonical.com (Postfix) with ESMTP id 1DB47A18723 for ; Fri, 14 Oct 2011 03:17:18 +0000 (UTC) Received: by eyg5 with SMTP id 5so1035327eyg.11 for ; Thu, 13 Oct 2011 20:17:18 -0700 (PDT) Received: by 10.223.92.144 with SMTP id r16mr1033220fam.23.1318562235969; Thu, 13 Oct 2011 20:17:15 -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.24.41 with SMTP id r9cs282806laf; Thu, 13 Oct 2011 20:17:15 -0700 (PDT) Received: by 10.227.195.208 with SMTP id ed16mr2217559wbb.102.1318562234199; Thu, 13 Oct 2011 20:17:14 -0700 (PDT) Received: from indium.canonical.com (indium.canonical.com. [91.189.90.7]) by mx.google.com with ESMTPS id fu18si4917463wbb.120.2011.10.13.20.17.13 (version=TLSv1/SSLv3 cipher=OTHER); Thu, 13 Oct 2011 20:17:14 -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 1REYGn-0001dW-EK for ; Fri, 14 Oct 2011 03:17:13 +0000 Received: from ackee.canonical.com (localhost [127.0.0.1]) by ackee.canonical.com (Postfix) with ESMTP id 617C8E0A11 for ; Fri, 14 Oct 2011 03:17: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: 131 X-Launchpad-Notification-Type: branch-revision To: Linaro Patch Tracker From: noreply@launchpad.net Subject: [Branch ~linaro-validation/lava-dispatcher/trunk] Rev 131: Merge branch for fixing bug 873043 Message-Id: <20111014031713.11008.92017.launchpad@ackee.canonical.com> Date: Fri, 14 Oct 2011 03:17: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="14124"; Instance="launchpad-lazr.conf" X-Launchpad-Hash: 22639373fc4ae1093ae28b5004a6ef0cba2618ee Merge authors: Spring Zhang (qzhang) Related merge proposals: https://code.launchpad.net/~qzhang/lava-dispatcher/fix-873043/+merge/79209 proposed by: Spring Zhang (qzhang) review: Approve - Yongqin Liu (liuyq0307) ------------------------------------------------------------ revno: 131 [merge] committer: Spring Zhang branch nick: fix-873043 timestamp: Fri 2011-10-14 11:14:31 +0800 message: Merge branch for fixing bug 873043 Bug #873043: AttributeError: 'LavaClient' object has no attribute 'android_result_dir' modified: lava_dispatcher/__init__.py --- 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_dispatcher/__init__.py' --- lava_dispatcher/__init__.py 2011-10-13 01:42:17 +0000 +++ lava_dispatcher/__init__.py 2011-10-14 03:14:31 +0000 @@ -146,7 +146,7 @@ @property def lava_result_dir(self): - if self.client.android_result_dir: + if isinstance(self.client, LavaAndroidClient): return self.client.android_result_dir return self.config.get("LAVA_RESULT_DIR")