Skip to content
This repository

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse code

Fix conflict from backout

  • Loading branch information...
commit 44abbe599bdbf59d26048bad71b266672687e00a 1 parent d0cb21c
Justin Wood (Callek) authored May 09, 2012

Showing 1 changed file with 6 additions and 0 deletions. Show diff stats Hide diff stats

  1. 6  sut_tools/sut_lib.py
6  sut_tools/sut_lib.py
@@ -279,7 +279,10 @@ def checkStalled(tegra):
279 279
     p, lines  = runCommand(['ps', '-U', 'cltbld'])
280 280
 
281 281
     this_tegra_lines = []
  282
+    for line in lines:
  283
+        if tegraIP in line or tegra in line:
282 284
             this_tegra_lines.append(line)
  285
+
283 286
     for line in this_tegra_lines:
284 287
         if ('bcontroller' in line) or ('server.js' in line):
285 288
             item = line.split()
@@ -511,7 +514,10 @@ def stopStalled(tegra):
511 514
     # 212 ??         0:17.99 /opt/local/Library/Frameworks/Python.framework/Versions/2.6/Resources/Python.app/Contents/MacOS/Python clientproxy.py -b --tegra=tegra-032
512 515
     p, lines  = runCommand(['ps', '-U', 'cltbld'])
513 516
     this_tegra_lines = []
  517
+    for line in lines:
  518
+        if tegraIP in line or tegra in line:
514 519
             this_tegra_lines.append(line)
  520
+
515 521
     for line in this_tegra_lines:
516 522
         if ('bcontroller' in line) or ('server.js' in line):
517 523
             item = line.split()

0 notes on commit 44abbe5

Please sign in to comment.
Something went wrong with that request. Please try again.