<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[260363] trunk/Tools</title>
</head>
<body>

<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt;  }
#msg dl a { font-weight: bold}
#msg dl a:link    { color:#fc3; }
#msg dl a:active  { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff  {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://trac.webkit.org/projects/webkit/changeset/260363">260363</a></dd>
<dt>Author</dt> <dd>philn@webkit.org</dd>
<dt>Date</dt> <dd>2020-04-20 05:29:23 -0700 (Mon, 20 Apr 2020)</dd>
</dl>

<h3>Log Message</h3>
<pre>[Flatpak SDK] Drive-by fixes
https://bugs.webkit.org/show_bug.cgi?id=210557

Reviewed by Žan Doberšek.

* flatpak/flatpakutils.py:
(WebkitFlatpak.run_in_sandbox): Properly format error message.
(WebkitFlatpak.main): Show flatpak update output.</pre>

<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkToolsChangeLog">trunk/Tools/ChangeLog</a></li>
<li><a href="#trunkToolsflatpakflatpakutilspy">trunk/Tools/flatpak/flatpakutils.py</a></li>
</ul>

</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkToolsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Tools/ChangeLog (260362 => 260363)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/ChangeLog    2020-04-20 12:10:03 UTC (rev 260362)
+++ trunk/Tools/ChangeLog       2020-04-20 12:29:23 UTC (rev 260363)
</span><span class="lines">@@ -1,3 +1,14 @@
</span><ins>+2020-04-20  Philippe Normand  <pnormand@igalia.com>
+
+        [Flatpak SDK] Drive-by fixes
+        https://bugs.webkit.org/show_bug.cgi?id=210557
+
+        Reviewed by Žan Doberšek.
+
+        * flatpak/flatpakutils.py:
+        (WebkitFlatpak.run_in_sandbox): Properly format error message.
+        (WebkitFlatpak.main): Show flatpak update output.
+
</ins><span class="cx"> 2020-04-20  Sergio Villar Senin  <svillar@igalia.com>
</span><span class="cx"> 
</span><span class="cx">         [WebXR][WPE] Let XR_RUNTIME_JSON environment variable go through for testing
</span></span></pre></div>
<a id="trunkToolsflatpakflatpakutilspy"></a>
<div class="modfile"><h4>Modified: trunk/Tools/flatpak/flatpakutils.py (260362 => 260363)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/flatpak/flatpakutils.py      2020-04-20 12:10:03 UTC (rev 260362)
+++ trunk/Tools/flatpak/flatpakutils.py 2020-04-20 12:29:23 UTC (rev 260363)
</span><span class="lines">@@ -531,7 +531,7 @@
</span><span class="cx">         gst_dir = os.environ.get('GST_BUILD_PATH')
</span><span class="cx">         if not gst_dir:
</span><span class="cx">             if building:
</span><del>-                Console.warning_message("$GST_BUILD_PATH environment variable not set. Skipping gst-build\n")
</del><ins>+                _log.debug("$GST_BUILD_PATH environment variable not set. Skipping gst-build\n")
</ins><span class="cx">             return []
</span><span class="cx"> 
</span><span class="cx">         if not os.path.exists(os.path.join(gst_dir, 'gst-env.py')):
</span><span class="lines">@@ -562,7 +562,8 @@
</span><span class="cx">         for option_name in ("branch.%s.webKitBranchBuild" % git_branch_name,
</span><span class="cx">                             "webKitBranchBuild"):
</span><span class="cx">             try:
</span><del>-                output = subprocess.check_output(("git", "config", "--bool", option_name)).strip()
</del><ins>+                with open(os.devnull, 'w') as devnull:
+                    output = subprocess.check_output(("git", "config", "--bool", option_name), stderr=devnull).strip()
</ins><span class="cx">             except subprocess.CalledProcessError:
</span><span class="cx">                 continue
</span><span class="cx"> 
</span><span class="lines">@@ -720,7 +721,7 @@
</span><span class="cx">             toolchain_name = os.environ.get("CC", "gcc")
</span><span class="cx">             toolchain_path = self.icc_version[toolchain_name]
</span><span class="cx">             if not os.path.isfile(toolchain_path):
</span><del>-                Console.error_message("%s is not a valid IceCC toolchain. Please run webkit-flatpak -r")
</del><ins>+                Console.error_message("%s is not a valid IceCC toolchain. Please run webkit-flatpak -r", toolchain_path)
</ins><span class="cx">                 return 1
</span><span class="cx">             forwarded.update({
</span><span class="cx">                 "CCACHE_PREFIX": "icecc",
</span><span class="lines">@@ -752,9 +753,8 @@
</span><span class="cx">             return 1
</span><span class="cx"> 
</span><span class="cx">         if self.update:
</span><del>-            Console.message("Updating Flatpak %s environment" % self.build_type)
</del><span class="cx">             repo = self.sdk_repo
</span><del>-            repo.flatpak("update")
</del><ins>+            repo.flatpak("update", show_output=True, comment="Updating Flatpak %s environment" % self.build_type)
</ins><span class="cx">             for package in self._get_packages():
</span><span class="cx">                 if package.name.startswith("org.webkit") and repo.is_app_installed(package.name) \
</span><span class="cx">                    and not repo.is_app_installed(package.name, branch=self.sdk_branch):
</span><span class="lines">@@ -822,10 +822,8 @@
</span><span class="cx">             return self.run_gdb()
</span><span class="cx">         elif self.user_command:
</span><span class="cx">             program = self.user_command[0]
</span><del>-            if program.endswith("build-webkit"):
-                Console.message("Building webkit")
-                if self.cmakeargs:
-                    self.user_command.append("--cmakeargs=%s" % self.cmakeargs)
</del><ins>+            if program.endswith("build-webkit") and self.cmakeargs:
+                self.user_command.append("--cmakeargs=%s" % self.cmakeargs)
</ins><span class="cx"> 
</span><span class="cx">             return self.run_in_sandbox(*self.user_command)
</span><span class="cx">         elif not self.update and not self.build_gst:
</span></span></pre>
</div>
</div>

</body>
</html>