<!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>[243999] 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/243999">243999</a></dd>
<dt>Author</dt> <dd>commit-queue@webkit.org</dd>
<dt>Date</dt> <dd>2019-04-08 05:14:43 -0700 (Mon, 08 Apr 2019)</dd>
</dl>

<h3>Log Message</h3>
<pre>[Flatpak] Second run update-webkitwpe-flatpak fails
https://bugs.webkit.org/show_bug.cgi?id=192702

Patch by Philippe Normand <pnormand@igalia.com> on 2019-04-08
Reviewed by Carlos Garcia Campos.

* flatpak/flatpakutils.py:
(FlatpakObject.flatpak): Fix typo.
(FlatpakPackage.install): When installing, also update to the configured remote commit.
* flatpak/org.webkit.WebKit.yaml: Update GNOME 3.28 SDK/runtime hashes.</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>
<li><a href="#trunkToolsflatpakorgwebkitWebKityaml">trunk/Tools/flatpak/org.webkit.WebKit.yaml</a></li>
</ul>

</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkToolsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Tools/ChangeLog (243998 => 243999)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/ChangeLog    2019-04-08 10:44:51 UTC (rev 243998)
+++ trunk/Tools/ChangeLog       2019-04-08 12:14:43 UTC (rev 243999)
</span><span class="lines">@@ -1,3 +1,15 @@
</span><ins>+2019-04-08  Philippe Normand  <pnormand@igalia.com>
+
+        [Flatpak] Second run update-webkitwpe-flatpak fails
+        https://bugs.webkit.org/show_bug.cgi?id=192702
+
+        Reviewed by Carlos Garcia Campos.
+
+        * flatpak/flatpakutils.py:
+        (FlatpakObject.flatpak): Fix typo.
+        (FlatpakPackage.install): When installing, also update to the configured remote commit.
+        * flatpak/org.webkit.WebKit.yaml: Update GNOME 3.28 SDK/runtime hashes.
+
</ins><span class="cx"> 2019-04-05  Sergio Villar Senin  <svillar@igalia.com>
</span><span class="cx"> 
</span><span class="cx">         [GTK][WPE] outlook.live.com displays old-fashioned UI
</span></span></pre></div>
<a id="trunkToolsflatpakflatpakutilspy"></a>
<div class="modfile"><h4>Modified: trunk/Tools/flatpak/flatpakutils.py (243998 => 243999)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/flatpak/flatpakutils.py      2019-04-08 10:44:51 UTC (rev 243998)
+++ trunk/Tools/flatpak/flatpakutils.py 2019-04-08 12:14:43 UTC (rev 243999)
</span><span class="lines">@@ -256,7 +256,7 @@
</span><span class="cx"> 
</span><span class="cx">     def flatpak(self, command, *args, **kwargs):
</span><span class="cx">         show_output = kwargs.pop("show_output", False)
</span><del>-        comment = kwargs.pop("commend", None)
</del><ins>+        comment = kwargs.pop("comment", None)
</ins><span class="cx">         if comment:
</span><span class="cx">             Console.message(comment)
</span><span class="cx"> 
</span><span class="lines">@@ -471,11 +471,13 @@
</span><span class="cx">             return False
</span><span class="cx"> 
</span><span class="cx">         args = ["install", self.repo.name, self.name, "--reinstall", self.branch, "--assumeyes"]
</span><ins>+        comment = "Installing from " + self.repo.name + " " + self.name + " " + self.arch + " " + self.branch
+        self.flatpak(*args, show_output=True, comment=comment)
+        if self.hash:
+            args = ["update", "--commit", self.hash]
+            comment = "Updating to %s" % self.hash
+            self.flatpak(*args, show_output=True, comment=comment)
</ins><span class="cx"> 
</span><del>-        self.flatpak(*args, show_output=True,
-                     comment="Installing from " + self.repo.name + " " +
-                             self.name + " " + self.arch + " " + self.branch)
-
</del><span class="cx">     def update(self):
</span><span class="cx">         if not self.is_installed(self.branch):
</span><span class="cx">             return self.install()
</span></span></pre></div>
<a id="trunkToolsflatpakorgwebkitWebKityaml"></a>
<div class="modfile"><h4>Modified: trunk/Tools/flatpak/org.webkit.WebKit.yaml (243998 => 243999)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/flatpak/org.webkit.WebKit.yaml       2019-04-08 10:44:51 UTC (rev 243998)
+++ trunk/Tools/flatpak/org.webkit.WebKit.yaml  2019-04-08 12:14:43 UTC (rev 243999)
</span><span class="lines">@@ -2,8 +2,8 @@
</span><span class="cx"> runtime: org.gnome.Platform
</span><span class="cx"> runtime-version: "3.28"
</span><span class="cx"> # Control the exact version of the Sdk/Runtime that is being used.
</span><del>-sdk-hash: ba3017972f1cc6c7c8b0ed7f80d3297ad4c6f4076bd799d0bab0e2cbaa3e3c0a
-runtime-hash: 9d3fe926d425ad837e40a0945020a00f09c1f531335987a753e07f276d76ee36
</del><ins>+sdk-hash: 31af0c10f8e42151220a728b52df0a5c37ea8e4b033825f40c30e44d11cb31d1
+runtime-hash: 6d1d0ebbd72404c61d109307eb2240542b7ad82608bc6428bba6f3eebcfc8bf3
</ins><span class="cx"> sdk: org.gnome.Sdk
</span><span class="cx"> command: %(COMMAND)s
</span><span class="cx"> finish-args:
</span></span></pre>
</div>
</div>

</body>
</html>