equal
deleted
inserted
replaced
495 stderr=subprocess.STDOUT, |
495 stderr=subprocess.STDOUT, |
496 shell = False, |
496 shell = False, |
497 universal_newlines=True, env=makeenv) |
497 universal_newlines=True, env=makeenv) |
498 stream = p.stdout |
498 stream = p.stdout |
499 |
499 |
500 |
500 inRecipe = False |
501 line = " " |
501 line = " " |
502 while line: |
502 while line: |
503 line = stream.readline() |
503 line = stream.readline() |
504 self.raptor.out.write(line) |
504 |
505 |
505 if line.startswith("<recipe"): |
|
506 inRecipe = True |
|
507 elif line.startswith("</recipe"): |
|
508 inRecipe = False |
|
509 |
|
510 # unless we are inside a "recipe", any line not starting |
|
511 # with "<" is free text that must be escaped. |
|
512 if inRecipe or line.startswith("<"): |
|
513 self.raptor.out.write(line) |
|
514 else: |
|
515 self.raptor.out.write(escape(line)) |
506 |
516 |
507 # should be done now |
517 # should be done now |
508 returncode = p.wait() |
518 returncode = p.wait() |
509 |
519 |
510 # Report end-time of the build |
520 # Report end-time of the build |