[Flatpak] Second run update-webkitwpe-flatpak fails
authorcommit-queue@webkit.org <commit-queue@webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Mon, 8 Apr 2019 12:14:43 +0000 (12:14 +0000)
committercommit-queue@webkit.org <commit-queue@webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Mon, 8 Apr 2019 12:14:43 +0000 (12:14 +0000)
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.

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@243999 268f45cc-cd09-0410-ab3c-d52691b4dbfc

Tools/ChangeLog
Tools/flatpak/flatpakutils.py
Tools/flatpak/org.webkit.WebKit.yaml

index 061cbcd..45ea427 100644 (file)
@@ -1,3 +1,15 @@
+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.
+
 2019-04-05  Sergio Villar Senin  <svillar@igalia.com>
 
         [GTK][WPE] outlook.live.com displays old-fashioned UI
index 04d7c8d..2e1bf98 100644 (file)
@@ -256,7 +256,7 @@ class FlatpakObject:
 
     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,10 +471,12 @@ class FlatpakPackage(FlatpakObject):
             return False
 
         args = ["install", self.repo.name, self.name, "--reinstall", self.branch, "--assumeyes"]
-
-        self.flatpak(*args, show_output=True,
-                     comment="Installing from " + self.repo.name + " " +
-                             self.name + " " + self.arch + " " + self.branch)
+        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)
 
     def update(self):
         if not self.is_installed(self.branch):
index fe5b008..167e43b 100644 (file)
@@ -2,8 +2,8 @@ app-id: %(PORTNAME)s
 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: