aboutsummaryrefslogtreecommitdiff
path: root/mesonbuild/msubprojects.py
diff options
context:
space:
mode:
authorPaweł Marczewski <pawel@invisiblethingslab.com>2021-12-10 14:26:37 +0100
committerXavier Claessens <xclaesse@gmail.com>2022-06-07 06:43:39 -0400
commit9061c3a52d355e478cbf83a6110b4cc3d2330ba6 (patch)
tree4ac2a2466c3a8d6a5f66d629cc57021ae11a5329 /mesonbuild/msubprojects.py
parent29c26d5b26397eaa3606d22d71309ecd1eb6b223 (diff)
downloadmeson-9061c3a52d355e478cbf83a6110b4cc3d2330ba6.zip
meson-9061c3a52d355e478cbf83a6110b4cc3d2330ba6.tar.gz
meson-9061c3a52d355e478cbf83a6110b4cc3d2330ba6.tar.bz2
wrap: Add support for applying a list of patch files
Co-authored-by: Xavier Claessens <xavier.claessens@collabora.com>
Diffstat (limited to 'mesonbuild/msubprojects.py')
-rwxr-xr-xmesonbuild/msubprojects.py1
1 files changed, 1 insertions, 0 deletions
diff --git a/mesonbuild/msubprojects.py b/mesonbuild/msubprojects.py
index 455b6e7..8a58d7d 100755
--- a/mesonbuild/msubprojects.py
+++ b/mesonbuild/msubprojects.py
@@ -205,6 +205,7 @@ class Runner:
self.git_stash()
self.git_output(['reset', '--hard', 'FETCH_HEAD'])
self.wrap_resolver.apply_patch()
+ self.wrap_resolver.apply_diff_files()
except GitException as e:
self.log(' -> Could not reset', mlog.bold(self.repo_dir), 'to', mlog.bold(revision))
self.log(mlog.red(e.output))