[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
State Accepted
Headers show

Commit Message

Senthil Kumaran April 25, 2013, 11:53 a.m.
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 <senthil.kumaran@linaro.org>
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

Patch

=== 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<partition>\d+)\s+"
         boot_cmds = re.sub(