Changeset 243999 in webkit

Timestamp:

Apr 8, 2019, 5:14:43 AM (7 years ago)

Author:

commit-queue@webkit.org

Message:

[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.

Location:

trunk/Tools

Files:

• ChangeLog (modified) (1 diff)
• flatpak/flatpakutils.py (modified) (2 diffs)
• flatpak/org.webkit.WebKit.yaml (modified) (1 diff)

trunk/Tools/ChangeLog

@@ +1 @@
+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>
 

trunk/Tools/flatpak/flatpakutils.py

@@ -257 +257 @@
     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)
@@ -472 +472 @@
 
         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):

trunk/Tools/flatpak/org.webkit.WebKit.yaml

@@ -3 +3 @@
 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