[Branch,~linaro-validation/lava-dispatcher/trunk] Rev 123: merge for MATER_STR not defined problem

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

Commit Message

Liu Yongqin Sept. 27, 2011, 9:48 a.m.
Merge authors:
  Yongqin Liu (liuyq0307)
Related merge proposals:
  https://code.launchpad.net/~liuyq0307/lava-dispatcher/fix-855384/+merge/76711
  proposed by: Yongqin Liu (liuyq0307)
  review: Approve - Spring Zhang (qzhang)
  review: Approve - Michael Hudson-Doyle (mwhudson)
------------------------------------------------------------
revno: 123 [merge]
committer: Yongqin Liu <yongqin.liu@linaro.org>
branch nick: lava-dispatcher
timestamp: Tue 2011-09-27 17:45:20 +0800
message:
  merge for MATER_STR not defined problem
modified:
  lava_dispatcher/actions/android_deploy.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/actions/android_deploy.py'
--- lava_dispatcher/actions/android_deploy.py	2011-09-23 02:53:30 +0000
+++ lava_dispatcher/actions/android_deploy.py	2011-09-27 09:45:20 +0000
@@ -21,7 +21,6 @@ 
 
 from lava_dispatcher.actions import BaseAction
 import os
-import sys
 import shutil
 import traceback
 import logging
@@ -131,9 +130,9 @@ 
                               '/mnt/lava/boot')
         client.run_cmd_master('wget -qO- %s |tar --numeric-owner -C /mnt/lava -xjf -' % boottbz2)
         if pkgbz2:
-            client.run_shell_command(
+            client.run_cmd_master(
                 'wget -qO- %s |tar --numeric-owner -C /mnt/lava -xjf -' 
-                    % pkgbz2, response = MASTER_STR)
+                    % pkgbz2)
 
         self.recreate_uInitrd()