Переглянути джерело

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).

git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@196484 91177308-0d34-0410-b5e6-96231b3b80d8
Alp Toker 11 роки тому
батько
коміт
4e57be3aa1
1 змінених файлів з 2 додано та 5 видалено
  1. 2 5
      tools/clang-format/clang-format-diff.py

+ 2 - 5
tools/clang-format/clang-format-diff.py

@@ -85,11 +85,8 @@ def main():
     if args.style:
     if args.style:
       command.extend(['-style', args.style])
       command.extend(['-style', args.style])
     p = subprocess.Popen(command, stdout=subprocess.PIPE,
     p = subprocess.Popen(command, stdout=subprocess.PIPE,
-                         stderr=subprocess.PIPE,
-                         stdin=subprocess.PIPE)
+                         stderr=None, stdin=subprocess.PIPE)
     stdout, stderr = p.communicate()
     stdout, stderr = p.communicate()
-    if stderr:
-      print stderr
     if p.returncode != 0:
     if p.returncode != 0:
       sys.exit(p.returncode);
       sys.exit(p.returncode);
 
 
@@ -102,7 +99,7 @@ def main():
                                   '(before formatting)', '(after formatting)')
                                   '(before formatting)', '(after formatting)')
       diff_string = string.join(diff, '')
       diff_string = string.join(diff, '')
       if len(diff_string) > 0:
       if len(diff_string) > 0:
-        print diff_string
+        sys.stdout.write(diff_string)
 
 
 if __name__ == '__main__':
 if __name__ == '__main__':
   main()
   main()