From patchwork Tue Sep 27 09:48:12 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Yongqin Liu X-Patchwork-Id: 4361 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 BD89223EFB for ; Tue, 27 Sep 2011 09:48:14 +0000 (UTC) Received: from mail-fx0-f52.google.com (mail-fx0-f52.google.com [209.85.161.52]) by fiordland.canonical.com (Postfix) with ESMTP id AC6B9A18B44 for ; Tue, 27 Sep 2011 09:48:14 +0000 (UTC) Received: by fxe23 with SMTP id 23so9662519fxe.11 for ; Tue, 27 Sep 2011 02:48:14 -0700 (PDT) Received: by 10.223.63.8 with SMTP id z8mr12128108fah.84.1317116894173; Tue, 27 Sep 2011 02:48:14 -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.3.234 with SMTP id f10cs66525laf; Tue, 27 Sep 2011 02:48:13 -0700 (PDT) Received: by 10.216.23.72 with SMTP id u50mr8643136weu.34.1317116892947; Tue, 27 Sep 2011 02:48:12 -0700 (PDT) Received: from indium.canonical.com (indium.canonical.com. [91.189.90.7]) by mx.google.com with ESMTPS id z7si20277525wec.73.2011.09.27.02.48.12 (version=TLSv1/SSLv3 cipher=OTHER); Tue, 27 Sep 2011 02:48:12 -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 1R8UGq-00016n-BV for ; Tue, 27 Sep 2011 09:48:12 +0000 Received: from ackee.canonical.com (localhost [127.0.0.1]) by ackee.canonical.com (Postfix) with ESMTP id 4BFAEE297C for ; Tue, 27 Sep 2011 09:48:12 +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: 123 X-Launchpad-Notification-Type: branch-revision To: Linaro Patch Tracker From: noreply@launchpad.net Subject: [Branch ~linaro-validation/lava-dispatcher/trunk] Rev 123: merge for MATER_STR not defined problem Message-Id: <20110927094812.22599.9223.launchpad@ackee.canonical.com> Date: Tue, 27 Sep 2011 09:48:12 -0000 Reply-To: noreply@launchpad.net Sender: bounces@canonical.com Errors-To: bounces@canonical.com Precedence: bulk X-Generated-By: Launchpad (canonical.com); Revision="14041"; Instance="launchpad-lazr.conf" X-Launchpad-Hash: 94ba6b0e48ed3c4e4355253c9c0458f5ded379c0 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 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 === 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()