diff options
| author | Dylan Baker <dylan@pnwbakers.com> | 2024-02-16 10:13:51 -0800 |
|---|---|---|
| committer | Dylan Baker <dylan@pnwbakers.com> | 2024-02-22 09:05:33 -0800 |
| commit | 39e1bf19fb653ac4f040e48b9a33aaa59dea1196 (patch) | |
| tree | c7c9b3913d18051fa64c32f91382792d28be07b1 /mesonbuild/msubprojects.py | |
| parent | 0abc8729bfd0e12cc28f0e3958b232a1a6a0d98c (diff) | |
| download | meson-39e1bf19fb653ac4f040e48b9a33aaa59dea1196.tar.gz | |
wrap: remove Resolver.packagename
Instead of being instance state, it's passed around. This isn't a big
deal internally since most of the users are protected, and the only time
an external change is required is a couple of places in msubprojects,
which is fine because the information is available.
Fixes: #12869
Diffstat (limited to 'mesonbuild/msubprojects.py')
| -rwxr-xr-x | mesonbuild/msubprojects.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/mesonbuild/msubprojects.py b/mesonbuild/msubprojects.py index d8afd92dd..15db3f928 100755 --- a/mesonbuild/msubprojects.py +++ b/mesonbuild/msubprojects.py @@ -250,7 +250,7 @@ class Runner: # avoid any data lost by mistake. self.git_stash() self.git_output(['reset', '--hard', 'FETCH_HEAD']) - self.wrap_resolver.apply_patch() + self.wrap_resolver.apply_patch(self.wrap.name) self.wrap_resolver.apply_diff_files() except GitException as e: self.log(' -> Could not reset', mlog.bold(self.repo_dir), 'to', mlog.bold(revision)) @@ -603,7 +603,7 @@ class Runner: if not os.path.isdir(self.repo_dir): self.log(' -> Not downloaded yet') return True - self.wrap_resolver.apply_patch() + self.wrap_resolver.apply_patch(self.wrap.name) return True if options.save: if 'patch_directory' not in self.wrap.values: |