diff options
| -rw-r--r-- | mesonbuild/wrap/wrap.py | 6 | ||||
| -rw-r--r-- | test cases/common/158 wrap file should not failed/meson.build | 1 | ||||
| -rw-r--r-- | test cases/common/158 wrap file should not failed/subprojects/foo.wrap | 11 | ||||
| -rw-r--r-- | test cases/common/158 wrap file should not failed/subprojects/packagecache/foo-1.0-patch.tar.xz | bin | 0 -> 232 bytes | |||
| -rw-r--r-- | test cases/common/158 wrap file should not failed/subprojects/packagecache/foo-1.0.tar.xz | bin | 0 -> 180 bytes |
5 files changed, 15 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: diff --git a/test cases/common/158 wrap file should not failed/meson.build b/test cases/common/158 wrap file should not failed/meson.build index 9d707ee..f4ec2a8 100644 --- a/test cases/common/158 wrap file should not failed/meson.build +++ b/test cases/common/158 wrap file should not failed/meson.build @@ -3,6 +3,7 @@ project('mainproj', 'c', ) subproject('zlib') +subproject('foo') executable('grabprog', files('src/subprojects/prog.c')) executable('grabprog2', files('src/subprojects/foo/prog2.c')) diff --git a/test cases/common/158 wrap file should not failed/subprojects/foo.wrap b/test cases/common/158 wrap file should not failed/subprojects/foo.wrap new file mode 100644 index 0000000..90d6d40 --- /dev/null +++ b/test cases/common/158 wrap file should not failed/subprojects/foo.wrap @@ -0,0 +1,11 @@ +[wrap-file] +directory = foo-1.0 + +source_url = http://something.invalid +source_filename = foo-1.0.tar.xz +source_hash = ae5fc03185654f76b459db16ca25809703f8821aeb39a433902244bb479c4b79 +lead_directory_missing = true + +patch_url = https://something.invalid/patch +patch_filename = foo-1.0-patch.tar.xz +patch_hash = 8f2e286a4b190228d4e0c25ddc91195449cfb5e5c52006355838964b244037da diff --git a/test cases/common/158 wrap file should not failed/subprojects/packagecache/foo-1.0-patch.tar.xz b/test cases/common/158 wrap file should not failed/subprojects/packagecache/foo-1.0-patch.tar.xz Binary files differnew file mode 100644 index 0000000..26d2927 --- /dev/null +++ b/test cases/common/158 wrap file should not failed/subprojects/packagecache/foo-1.0-patch.tar.xz diff --git a/test cases/common/158 wrap file should not failed/subprojects/packagecache/foo-1.0.tar.xz b/test cases/common/158 wrap file should not failed/subprojects/packagecache/foo-1.0.tar.xz Binary files differnew file mode 100644 index 0000000..2647ef9 --- /dev/null +++ b/test cases/common/158 wrap file should not failed/subprojects/packagecache/foo-1.0.tar.xz |