Changeset 260426 in webkit

Timestamp:

Apr 21, 2020 6:26:37 AM (4 years ago)

Author:

Philippe Normand

Message:

[Flatpak SDK] Silence git stderr output
​https://bugs.webkit.org/show_bug.cgi?id=210789

Reviewed by Sergio Villar Senin.

• flatpak/flatpakutils.py:

(WebkitFlatpak.is_branch_build): Don't display git errors, usually
emitted when operating on a SVN checkout.

Location:

trunk/Tools

Files:

• ChangeLog (modified) (1 diff)
• flatpak/flatpakutils.py (modified) (1 diff)

trunk/Tools/ChangeLog

@@ +1 @@
+2020-04-21  Philippe Normand  <pnormand@igalia.com>
+
+        [Flatpak SDK] Silence git stderr output
+        https://bugs.webkit.org/show_bug.cgi?id=210789
+
+        Reviewed by Sergio Villar Senin.
+
+        * flatpak/flatpakutils.py:
+        (WebkitFlatpak.is_branch_build): Don't display git errors, usually
+        emitted when operating on a SVN checkout.
+
 2020-04-21  Philippe Normand  <pnormand@igalia.com>
 

trunk/Tools/flatpak/flatpakutils.py

@@ -560 +560 @@
     def is_branch_build(self):
         try:
-            rev_parse = subprocess.check_output(("git", "rev-parse", "--abbrev-ref", "HEAD"))
+            with open(os.devnull, 'w') as devnull:
+                rev_parse = subprocess.check_output(("git", "rev-parse", "--abbrev-ref", "HEAD"), stderr=devnull)
         except subprocess.CalledProcessError:
+            # This is likely not a git checkout.
             return False
         git_branch_name = rev_parse.decode("utf-8").strip()