branch | stable |
changeset 1334 | 2ff0ff8404a5 |
parent 1327 | 953d562c3ebf |
child 1335 | d15090c7d555 |
1332:e307d04d3c4d | 1334:2ff0ff8404a5 |
---|---|
776 |
776 |
777 # Merge the script output back into a unified test |
777 # Merge the script output back into a unified test |
778 |
778 |
779 pos = -1 |
779 pos = -1 |
780 postout = [] |
780 postout = [] |
781 ret = 0 |
|
782 for l in output: |
781 for l in output: |
783 lout, lcmd = l, None |
782 lout, lcmd = l, None |
784 if salt in l: |
783 if salt in l: |
785 lout, lcmd = l.split(salt, 1) |
784 lout, lcmd = l.split(salt, 1) |
786 |
785 |