Skip to content

Commit

Permalink
[GTK] Unreviewed, build fix for GTK-Linux-64bit-Release-Packaging-Nig…
Browse files Browse the repository at this point in the history
…htly-Ubuntu2004 after 278510@main

Fix syntax error and check meson version is not None.

* Tools/jhbuild/jhbuildrc_common.py:
(meson_version):
(init):

Canonical link: https://commits.webkit.org/278646@main
  • Loading branch information
dpino committed May 11, 2024
1 parent da248b2 commit c524a27
Showing 1 changed file with 3 additions and 3 deletions.
6 changes: 3 additions & 3 deletions Tools/jhbuild/jhbuildrc_common.py
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ def meson_version():
else:
return None
except FileNotFoundError:
return none
return None


def init(jhbuildrc_globals, jhbuild_platform):
Expand Down Expand Up @@ -116,5 +116,5 @@ def init(jhbuildrc_globals, jhbuild_platform):
jhbuildrc_globals['conditions'].add('Thunder')

REQUIRED_MESON_VERSION = 622
if meson_version() < REQUIRED_MESON_VERSION:
conditions.add('require-meson')
if not meson_version() or meson_version() < REQUIRED_MESON_VERSION:
jhbuildrc_globals['conditions'].add('require-meson')

0 comments on commit c524a27

Please sign in to comment.