[Branch,~linaro-validation/lava-dispatcher/trunk] Rev 131: Merge branch for fixing bug 873043

Message ID 20111014031713.11008.92017.launchpad@ackee.canonical.com
State Accepted
Headers show

Commit Message

Spring Zhang Oct. 14, 2011, 3:17 a.m.
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 <spring.zhang@linaro.org>
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

Patch

=== 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")