Title: [243999] trunk/Tools
- Revision
- 243999
- Author
- commit-qu...@webkit.org
- Date
- 2019-04-08 05:14:43 -0700 (Mon, 08 Apr 2019)
Log Message
[Flatpak] Second run update-webkitwpe-flatpak fails
https://bugs.webkit.org/show_bug.cgi?id=192702
Patch by Philippe Normand <pnorm...@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.
Modified Paths
Diff
Modified: trunk/Tools/ChangeLog (243998 => 243999)
--- trunk/Tools/ChangeLog 2019-04-08 10:44:51 UTC (rev 243998)
+++ trunk/Tools/ChangeLog 2019-04-08 12:14:43 UTC (rev 243999)
@@ -1,3 +1,15 @@
+2019-04-08 Philippe Normand <pnorm...@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.
+
2019-04-05 Sergio Villar Senin <svil...@igalia.com>
[GTK][WPE] outlook.live.com displays old-fashioned UI
Modified: trunk/Tools/flatpak/flatpakutils.py (243998 => 243999)
--- 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)
@@ -256,7 +256,7 @@
def flatpak(self, command, *args, **kwargs):
show_output = kwargs.pop("show_output", False)
- comment = kwargs.pop("commend", None)
+ comment = kwargs.pop("comment", None)
if comment:
Console.message(comment)
@@ -471,11 +471,13 @@
return False
args = ["install", self.repo.name, self.name, "--reinstall", self.branch, "--assumeyes"]
+ 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)
- self.flatpak(*args, show_output=True,
- comment="Installing from " + self.repo.name + " " +
- self.name + " " + self.arch + " " + self.branch)
-
def update(self):
if not self.is_installed(self.branch):
return self.install()
Modified: trunk/Tools/flatpak/org.webkit.WebKit.yaml (243998 => 243999)
--- 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)
@@ -2,8 +2,8 @@
runtime: org.gnome.Platform
runtime-version: "3.28"
# Control the exact version of the Sdk/Runtime that is being used.
-sdk-hash: ba3017972f1cc6c7c8b0ed7f80d3297ad4c6f4076bd799d0bab0e2cbaa3e3c0a
-runtime-hash: 9d3fe926d425ad837e40a0945020a00f09c1f531335987a753e07f276d76ee36
+sdk-hash: 31af0c10f8e42151220a728b52df0a5c37ea8e4b033825f40c30e44d11cb31d1
+runtime-hash: 6d1d0ebbd72404c61d109307eb2240542b7ad82608bc6428bba6f3eebcfc8bf3
sdk: org.gnome.Sdk
command: %(COMMAND)s
finish-args:
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
