From patchwork Mon May 13 08:51:17 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Senthil Kumaran X-Patchwork-Id: 16875 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-wg0-f70.google.com (mail-wg0-f70.google.com [74.125.82.70]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id 5B44523973 for ; Mon, 13 May 2013 08:52:04 +0000 (UTC) Received: by mail-wg0-f70.google.com with SMTP id z12sf6021868wgg.5 for ; Mon, 13 May 2013 01:51:31 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20120113; h=x-received:x-beenthere:x-received:received-spf:x-received :x-forwarded-to:x-forwarded-for:delivered-to:x-received:received-spf :mime-version:x-launchpad-project:x-launchpad-branch :x-launchpad-message-rationale:x-launchpad-branch-revision-number :x-launchpad-notification-type:to:from:subject:message-id:date :reply-to:sender:errors-to:precedence:x-generated-by :x-launchpad-hash:x-gm-message-state:x-original-sender :x-original-authentication-results:mailing-list:list-id :x-google-group-id:list-post:list-help:list-archive:list-unsubscribe :content-type; bh=oz+QqvAvcUUT0exclfwdEsY39q2nYf4O3XGWIw972hg=; b=g6/VyY5KBYs4Qv+NvTxmhzxlW8jYpeXE+xnvDp4RJyfklNJv0BpS6P804fu2r6cOIU wmW1Vu1pSxEnDdBauvCU+FfNOsPUjTwq58tjAIbXbYGDddYVR2KVPyhvD7yK2HtYLuIk 4gLe2Q9/5+76doGGkGE+M5Tzw0p3zRuc5Q/OMdNWJqJkn9WdfCYAoSAoPQ/YP+WrZkH1 qKq5ko8D6v5OW6kWJiJlBui2OVHsbuJAPJt9tX1dEmuiW8gNvmYPZ/uTDcuOB2gGG0lk 3ypTJV6rW0/zsZ3Z1rZpehEDwyBiSc/kEzAgbztcSAUW5o/gWTAUceF1R3BRiMyMx22x OzhA== X-Received: by 10.180.10.196 with SMTP id k4mr3178266wib.6.1368435091537; Mon, 13 May 2013 01:51:31 -0700 (PDT) X-BeenThere: patchwork-forward@linaro.org Received: by 10.180.90.70 with SMTP id bu6ls666408wib.30.gmail; Mon, 13 May 2013 01:51:31 -0700 (PDT) X-Received: by 10.194.242.135 with SMTP id wq7mr14150980wjc.39.1368435091436; Mon, 13 May 2013 01:51:31 -0700 (PDT) Received: from mail-ve0-x230.google.com (mail-ve0-x230.google.com [2607:f8b0:400c:c01::230]) by mx.google.com with ESMTPS id hu9si3858051wjb.185.2013.05.13.01.51.31 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Mon, 13 May 2013 01:51:31 -0700 (PDT) Received-SPF: neutral (google.com: 2607:f8b0:400c:c01::230 is neither permitted nor denied by best guess record for domain of patch+caf_=patchwork-forward=linaro.org@linaro.org) client-ip=2607:f8b0:400c:c01::230; Received: by mail-ve0-f176.google.com with SMTP id c13so350869vea.35 for ; Mon, 13 May 2013 01:51:30 -0700 (PDT) X-Received: by 10.58.144.231 with SMTP id sp7mr17823641veb.34.1368435090331; Mon, 13 May 2013 01:51:30 -0700 (PDT) X-Forwarded-To: patchwork-forward@linaro.org X-Forwarded-For: patch@linaro.org patchwork-forward@linaro.org Delivered-To: patches@linaro.org Received: by 10.220.217.15 with SMTP id hk15csp10175vcb; Mon, 13 May 2013 01:51:19 -0700 (PDT) X-Received: by 10.180.36.205 with SMTP id s13mr16942989wij.31.1368435078702; Mon, 13 May 2013 01:51:18 -0700 (PDT) Received: from indium.canonical.com (indium.canonical.com. [91.189.90.7]) by mx.google.com with ESMTPS id f10si2813936wiz.26.2013.05.13.01.51.18 for (version=TLSv1 cipher=RC4-SHA bits=128/128); Mon, 13 May 2013 01:51:18 -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; Received: from ackee.canonical.com ([91.189.89.26]) by indium.canonical.com with esmtp (Exim 4.71 #1 (Debian)) id 1UboTV-0004Zp-HP for ; Mon, 13 May 2013 08:51:17 +0000 Received: from ackee.canonical.com (localhost [127.0.0.1]) by ackee.canonical.com (Postfix) with ESMTP id 5F683E04F3 for ; Mon, 13 May 2013 08:51:17 +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: 596 X-Launchpad-Notification-Type: branch-revision To: Linaro Patch Tracker From: noreply@launchpad.net Subject: [Branch ~linaro-validation/lava-dispatcher/trunk] Rev 596: Fix bug #1175818 - MASTER_PS1 is hard_coded, not overridden by master_str. Message-Id: <20130513085117.2577.54564.launchpad@ackee.canonical.com> Date: Mon, 13 May 2013 08:51:17 -0000 Reply-To: noreply@launchpad.net Sender: bounces@canonical.com Errors-To: bounces@canonical.com Precedence: list X-Generated-By: Launchpad (canonical.com); Revision="16614"; Instance="launchpad-lazr.conf" X-Launchpad-Hash: cc312dc6f53e843722838659024313d61abe4638 X-Gm-Message-State: ALoCoQlqcjzRo3ixWYrQZTiwJA6F2OqVUzZyinWTDtYFGvsCZ/+fxfp54K0ljeN+/nPXmOIyjCsJ X-Original-Sender: noreply@launchpad.net X-Original-Authentication-Results: mx.google.com; spf=neutral (google.com: 2607:f8b0:400c:c01::230 is neither permitted nor denied by best guess record for domain of patch+caf_=patchwork-forward=linaro.org@linaro.org) smtp.mail=patch+caf_=patchwork-forward=linaro.org@linaro.org Mailing-list: list patchwork-forward@linaro.org; contact patchwork-forward+owners@linaro.org List-ID: X-Google-Group-Id: 836684582541 List-Post: , List-Help: , List-Archive: List-Unsubscribe: , Merge authors: Arthur She (arthur-she) Related merge proposals: https://code.launchpad.net/~arthur-she/lava-dispatcher/fix-for-bug-1175818/+merge/162946 proposed by: Arthur She (arthur-she) review: Approve - Senthil Kumaran S (stylesen) review: Needs Fixing - Antonio Terceiro (terceiro) ------------------------------------------------------------ revno: 596 [merge] committer: Senthil Kumaran branch nick: trunk timestamp: Mon 2013-05-13 14:18:28 +0530 message: Fix bug #1175818 - MASTER_PS1 is hard_coded, not overridden by master_str. modified: lava_dispatcher/device/master.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/device/master.py' --- lava_dispatcher/device/master.py 2013-05-02 21:43:14 +0000 +++ lava_dispatcher/device/master.py 2013-05-09 02:56:57 +0000 @@ -61,12 +61,16 @@ class MasterImageTarget(Target): - MASTER_PS1 = 'root@master [rc=$(echo \$?)]# ' - MASTER_PS1_PATTERN = 'root@master \[rc=(\d+)\]# ' + MASTER_PS1 = ' [rc=$(echo \$?)]# ' + MASTER_PS1_PATTERN = ' \[rc=(\d+)\]# ' def __init__(self, context, config): super(MasterImageTarget, self).__init__(context, config) + # Update variable according to config file + self.MASTER_PS1 = self.config.master_str + self.MASTER_PS1 + self.MASTER_PS1_PATTERN = self.config.master_str + self.MASTER_PS1_PATTERN + Target.android_deployment_data['boot_cmds'] = 'boot_cmds_android' Target.ubuntu_deployment_data['boot_cmds'] = 'boot_cmds' Target.oe_deployment_data['boot_cmds'] = 'boot_cmds_oe'