From patchwork Thu Apr 25 11:53:13 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Senthil Kumaran X-Patchwork-Id: 16394 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-qa0-f70.google.com (mail-qa0-f70.google.com [209.85.216.70]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id 080482395D for ; Thu, 25 Apr 2013 11:54:09 +0000 (UTC) Received: by mail-qa0-f70.google.com with SMTP id hg5sf2238433qab.1 for ; Thu, 25 Apr 2013 04:53:15 -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=Kng99UZabTsd6afsonObS21l/uG1XgL7WCnDmw9ZHtc=; b=CWoTZJ6moxEyzxl0JExyJrLyY74iQCxHfx3FYPgQ1NWW7na7aMDWMMN6xMsSqbaV5T vgcxDKnGIT6Bpu3R6dHzClSqqG/2hfCbykdcbVRQj5mg4M42+VuE3hkUgSsyoatbHZ8H wKR9tDkYQ9OeGYS7D4AEEZQTSJkkjMnzUdSyvufJd4Lp4NYUB+3K61Irc0xyEnVd2SCw 0QcE9lwayPMTFR+4nGFL3Pv64BteEF9ESne+JbH+LFsfAd0DeNAd/ddSlba3Azzz7pZC 8dpJsoyWvkp5kpniiu3fnO8WGLxVFs4NQHhODDaiM646cD5KHmQgE3CQLMuNyiGlVp5/ H1iQ== X-Received: by 10.224.58.77 with SMTP id f13mr27082635qah.7.1366890795548; Thu, 25 Apr 2013 04:53:15 -0700 (PDT) X-BeenThere: patchwork-forward@linaro.org Received: by 10.49.64.132 with SMTP id o4ls1378896qes.11.gmail; Thu, 25 Apr 2013 04:53:15 -0700 (PDT) X-Received: by 10.52.70.108 with SMTP id l12mr22862453vdu.40.1366890795387; Thu, 25 Apr 2013 04:53:15 -0700 (PDT) Received: from mail-ve0-x22c.google.com (mail-ve0-x22c.google.com [2607:f8b0:400c:c01::22c]) by mx.google.com with ESMTPS id wl5si3120835vec.25.2013.04.25.04.53.15 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Thu, 25 Apr 2013 04:53:15 -0700 (PDT) Received-SPF: neutral (google.com: 2607:f8b0:400c:c01::22c 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::22c; Received: by mail-ve0-f172.google.com with SMTP id db10so1253202veb.3 for ; Thu, 25 Apr 2013 04:53:15 -0700 (PDT) X-Received: by 10.220.39.69 with SMTP id f5mr27320928vce.45.1366890795257; Thu, 25 Apr 2013 04:53:15 -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.58.127.98 with SMTP id nf2csp18784veb; Thu, 25 Apr 2013 04:53:14 -0700 (PDT) X-Received: by 10.180.77.10 with SMTP id o10mr1025694wiw.10.1366890794055; Thu, 25 Apr 2013 04:53:14 -0700 (PDT) Received: from indium.canonical.com (indium.canonical.com. [91.189.90.7]) by mx.google.com with ESMTPS id nh15si9110201wic.76.2013.04.25.04.53.13 for (version=TLSv1 cipher=RC4-SHA bits=128/128); Thu, 25 Apr 2013 04:53: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; Received: from ackee.canonical.com ([91.189.89.26]) by indium.canonical.com with esmtp (Exim 4.71 #1 (Debian)) id 1UVKjh-0005IM-Dn for ; Thu, 25 Apr 2013 11:53:13 +0000 Received: from ackee.canonical.com (localhost [127.0.0.1]) by ackee.canonical.com (Postfix) with ESMTP id 5B014E010A for ; Thu, 25 Apr 2013 11:53: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: 589 X-Launchpad-Notification-Type: branch-revision To: Linaro Patch Tracker From: noreply@launchpad.net Subject: [Branch ~linaro-validation/lava-dispatcher/trunk] Rev 589: Remove ugly code which was snowball specific, introduced yesterday as a Message-Id: <20130425115313.29294.10034.launchpad@ackee.canonical.com> Date: Thu, 25 Apr 2013 11:53:13 -0000 Reply-To: noreply@launchpad.net Sender: bounces@canonical.com Errors-To: bounces@canonical.com Precedence: list X-Generated-By: Launchpad (canonical.com); Revision="16580"; Instance="launchpad-lazr.conf" X-Launchpad-Hash: 33a4f46985ab5dfb2cc784dd6568166da3cd81bb X-Gm-Message-State: ALoCoQlALDLS4uaeMDn2N3eDNaMaN3bFNqLHYOK+foU1ic9pmBKCe4fLPTV1L/hrsGYLHseQuoM0 X-Original-Sender: noreply@launchpad.net X-Original-Authentication-Results: mx.google.com; spf=neutral (google.com: 2607:f8b0:400c:c01::22c 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: Senthil Kumaran S (stylesen) Related merge proposals: https://code.launchpad.net/~stylesen/lava-dispatcher/fix-bug-1172235-take-1/+merge/160864 proposed by: Senthil Kumaran S (stylesen) review: Approve - Dave Pigott (dpigott) ------------------------------------------------------------ revno: 589 [merge] committer: Senthil Kumaran branch nick: trunk timestamp: Thu 2013-04-25 17:24:46 +0530 message: Remove ugly code which was snowball specific, introduced yesterday as a half baked solution without knowing the root cause :) 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-04-25 09:36:40 +0000 +++ lava_dispatcher/device/master.py 2013-04-25 11:36:15 +0000 @@ -183,21 +183,10 @@ Returns boot_cmds list after rewriting things such as: * partition number from n to n+2 - * root=LABEL=testrootfs or root=/dev/mmcblk1p5 instead of - root=UUID=ab34-... + * root=LABEL=testrootfs instead of root=UUID=ab34-... """ - - # This console value is specific to snowball. A snowball has mmcblk1 - if 'ttyAMA2' in boot_cmds: - boot_cmds = re.sub(r"root=UUID=\S+", - "root=/dev/mmcblk1p5", - boot_cmds, - re.MULTILINE) - else: - boot_cmds = re.sub(r"root=UUID=\S+", - "root=LABEL=testrootfs", - boot_cmds, - re.MULTILINE) + boot_cmds = re.sub( + r"root=UUID=\S+", "root=LABEL=testrootfs", boot_cmds, re.MULTILINE) pattern = "\s+\d+:(?P\d+)\s+" boot_cmds = re.sub(