Changeset 268542 in webkit


Ignore:
Timestamp:
Oct 15, 2020 12:09:01 PM (3 years ago)
Author:
Lauro Moura
Message:

[Flatpak SDK] Check for installed packages in setup_buildir
https://bugs.webkit.org/show_bug.cgi?id=217768

Reviewed by Philippe Normand.

During a cleanup of one of the bots, setup_builddir failed with a null
self.sdk member, which is set in get_packages.

While I could not reproduce it again, this commit prevents this by
checking whether the packages are installed before continuing the
original setup_builddir steps.

  • flatpak/flatpakutils.py:

(WebkitFlatpak.setup_builddir): Check for installed packages.
(WebkitFlatpak.run_in_sandbox): Check for setup_builddir return code.
(WebkitFlatpak.check_installed_packages): Extracted from
setup_dev_env.
(WebkitFlatpak.setup_dev_env): Call extracted method.

Location:
trunk/Tools
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • trunk/Tools/ChangeLog

    r268538 r268542  
     12020-10-15  Lauro Moura  <lmoura@igalia.com>
     2
     3        [Flatpak SDK] Check for installed packages in setup_buildir
     4        https://bugs.webkit.org/show_bug.cgi?id=217768
     5
     6        Reviewed by Philippe Normand.
     7
     8        During a cleanup of one of the bots, setup_builddir failed with a null
     9        self.sdk member, which is set in get_packages.
     10
     11        While I could not reproduce it again, this commit prevents this by
     12        checking whether the packages are installed before continuing the
     13        original setup_builddir steps.
     14
     15        * flatpak/flatpakutils.py:
     16        (WebkitFlatpak.setup_builddir): Check for installed packages.
     17        (WebkitFlatpak.run_in_sandbox): Check for setup_builddir return code.
     18        (WebkitFlatpak.check_installed_packages): Extracted from
     19        setup_dev_env.
     20        (WebkitFlatpak.setup_dev_env): Call extracted method.
     21
    1222020-10-15  Jonathan Bedard  <jbedard@apple.com>
    223
  • trunk/Tools/flatpak/flatpakutils.py

    r267010 r268542  
    573573    def setup_builddir(self):
    574574        if os.path.exists(os.path.join(self.flatpak_build_path, "metadata")):
    575             return
     575            return True
     576
     577        if not self.check_installed_packages():
     578            return False
    576579
    577580        self.sdk_repo.flatpak("build-init",
     
    581584                              str(self.runtime),
    582585                              self.sdk.branch)
     586
     587        return True
     588
    583589
    584590    def setup_gstbuild(self, building):
     
    653659
    654660    def run_in_sandbox(self, *args, **kwargs):
    655         self.setup_builddir()
     661        if not self.setup_builddir():
     662            return False
    656663        cwd = kwargs.get("cwd", None)
    657664        extra_env_vars = kwargs.get("env", {})
     
    946953            return sccache_toolchains
    947954
     955    def check_installed_packages(self):
     956        for package in self._get_packages():
     957            if package.name.startswith("org.webkit") and not package.is_installed(self.sdk_branch):
     958                Console.error_message("Flatpak package %s not installed. Please update your SDK: Tools/Scripts/update-webkit-flatpak", package)
     959                return False
     960        else:
     961            return True
     962
     963
    948964    def setup_dev_env(self):
    949965        if not os.path.exists(os.path.join(self.flatpak_build_path, "runtime", "org.webkit.Sdk")) or self.update:
    950966            self.install_all()
    951967
    952         if not self.update:
    953             for package in self._get_packages():
    954                 if package.name.startswith("org.webkit") and not package.is_installed(self.sdk_branch):
    955                     Console.error_message("Flatpak package %s not installed. Please update your SDK: Tools/Scripts/update-webkit-flatpak", package)
    956                     return 1
     968        if not self.update and not self.check_installed_packages():
     969            return 1
    957970
    958971        if self.gdb or self.gdb_stack_trace:
Note: See TracChangeset for help on using the changeset viewer.