From fcf30326fd5f3815b2e6e2b1716f4c8be3c7ebb6 Mon Sep 17 00:00:00 2001 From: Alp Toker Date: Thu, 5 Dec 2013 08:14:54 +0000 Subject: [PATCH] clang-format-diff.py: pass through errors to stderr, not stdout Also use write() for unified diff output to avoid further processing by the print function (e.g. trailing newline). llvm-svn: 196484 --- clang/tools/clang-format/clang-format-diff.py | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/clang/tools/clang-format/clang-format-diff.py b/clang/tools/clang-format/clang-format-diff.py index b042d957af02..a62cae8ad51b 100755 --- a/clang/tools/clang-format/clang-format-diff.py +++ b/clang/tools/clang-format/clang-format-diff.py @@ -85,11 +85,8 @@ def main(): if args.style: command.extend(['-style', args.style]) p = subprocess.Popen(command, stdout=subprocess.PIPE, - stderr=subprocess.PIPE, - stdin=subprocess.PIPE) + stderr=None, stdin=subprocess.PIPE) stdout, stderr = p.communicate() - if stderr: - print stderr if p.returncode != 0: sys.exit(p.returncode); @@ -102,7 +99,7 @@ def main(): '(before formatting)', '(after formatting)') diff_string = string.join(diff, '') if len(diff_string) > 0: - print diff_string + sys.stdout.write(diff_string) if __name__ == '__main__': main()