diff options
| author | Xavier Claessens <xavier.claessens@collabora.com> | 2018-10-20 09:50:51 -0400 |
|---|---|---|
| committer | Jussi Pakkanen <jpakkane@gmail.com> | 2018-10-21 23:21:36 +0300 |
| commit | adb9fdef3a426b9f458666f4683a002294a535b0 (patch) | |
| tree | 25ac7257de9b7e45717d8ee65b01bbecb332ed9f /mesonbuild/wrap/wrap.py | |
| parent | 1a2f5b3bc83ba7d145a56b5ea9174f19209e182d (diff) | |
| download | meson-adb9fdef3a426b9f458666f4683a002294a535b0.zip meson-adb9fdef3a426b9f458666f4683a002294a535b0.tar.gz meson-adb9fdef3a426b9f458666f4683a002294a535b0.tar.bz2 | |
wrap: Fix crash with file based wraps
Add unit test to avoid regressions in the future.
Diffstat (limited to 'mesonbuild/wrap/wrap.py')
| -rw-r--r-- | mesonbuild/wrap/wrap.py | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/mesonbuild/wrap/wrap.py b/mesonbuild/wrap/wrap.py index a4dd749..248c365 100644 --- a/mesonbuild/wrap/wrap.py +++ b/mesonbuild/wrap/wrap.py @@ -198,7 +198,7 @@ class Resolver: raise WrapException(m.format(out)) def get_file(self): - path = self.get_file_internal(self.wrap, 'source') + path = self.get_file_internal('source') extract_dir = self.subdir_root # Some upstreams ship packages that do not have a leading directory. # Create one for them. @@ -319,8 +319,8 @@ class Resolver: self.download(what, cache_path) return cache_path - def apply_patch(self, p): - path = self.get_file_internal(p, 'patch') + def apply_patch(self): + path = self.get_file_internal('patch') try: shutil.unpack_archive(path, self.subdir_root) except Exception: |