Title: [260426] trunk/Tools
- Revision
- 260426
- Author
- [email protected]
- Date
- 2020-04-21 06:26:37 -0700 (Tue, 21 Apr 2020)
Log 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.
Modified Paths
Diff
Modified: trunk/Tools/ChangeLog (260425 => 260426)
--- trunk/Tools/ChangeLog 2020-04-21 12:31:22 UTC (rev 260425)
+++ trunk/Tools/ChangeLog 2020-04-21 13:26:37 UTC (rev 260426)
@@ -1,5 +1,16 @@
2020-04-21 Philippe Normand <[email protected]>
+ [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 <[email protected]>
+
[CMake][Flatpak SDK] gst-build-backed build fails
https://bugs.webkit.org/show_bug.cgi?id=210742
Modified: trunk/Tools/flatpak/flatpakutils.py (260425 => 260426)
--- trunk/Tools/flatpak/flatpakutils.py 2020-04-21 12:31:22 UTC (rev 260425)
+++ trunk/Tools/flatpak/flatpakutils.py 2020-04-21 13:26:37 UTC (rev 260426)
@@ -559,8 +559,10 @@
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()
for option_name in ("branch.%s.webKitBranchBuild" % git_branch_name,
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
