Made multiwrap use wrabdb where possible.

manual tests/2 multiwrap/subprojects/libpng.wrap

@@ -1,7 +1,7 @@
 [wrap-file]
 directory = libpng-1.6.16
 
-source_url = ftp://ftp.simplesystems.org/pub/libpng/png/src/libpng16/libpng-1.6.16.tar.gz
+source_url = ftp://ftp.simplesystems.org/pub/libpng/png/src/history/libpng16/libpng-1.6.16.tar.gz
 source_filename = libpng-1.6.16.tar.gz
 source_hash = 02f96b6bad5a381d36d7ba7a5d9be3b06f7fe6c274da00707509c23592a073ad
 

manual tests/2 multiwrap/subprojects/lua.wrap

@@ -5,6 +5,7 @@ source_url = http://www.lua.org/ftp/lua-5.3.0.tar.gz
 source_filename = lua-5.3.0.tar.gz
 source_hash = ae4a5eb2d660515eb191bfe3e061f2b8ffe94dce73d32cfd0de090ddcc0ddb01
 
-patch_url = https://dl.dropboxusercontent.com/u/37517477/lua53-meson.zip
-patch_filename = lua53-meson.zip
-patch_hash = 076d0d57d33ec996c556722c8eeb624a364c66fe9d2225e590b1bc9ae34fbd6e
+
+patch_url = http://wrapdb.mesonbuild.com/v1/projects/lua/5.3.0/2/get_zip
+patch_filename = lua-5.3.0-2-wrap.zip
+patch_hash = f7bc18b6a6487dd7d78b5d3b2d49861a76212dfd79b40e32f4b1e5655361ffb5

manual tests/2 multiwrap/subprojects/zlib.wrap

@@ -5,6 +5,6 @@ source_url = http://zlib.net/zlib-1.2.8.tar.gz
 source_filename = zlib-1.2.8.tar.gz
 source_hash = 36658cb768a54c1d4dec43c3116c27ed893e88b02ecfcb44f2166f9c0b7f2a0d
 
-patch_url = https://dl.dropboxusercontent.com/u/37517477/zlib128-meson.tar.gz
-patch_filename = zlib128-meson.tar.gz
-patch_hash = 03c868bf22d7e35c978e8b9572c4aea1181606c15c3dd19f0713a8479fe27edc
+patch_url = http://wrapdb.mesonbuild.com/v1/projects/zlib/1.2.8/4/get_zip
+patch_filename = zlib-1.2.8-4-wrap.zip
+patch_hash = 2327a42c8f73a4289ee8c9cd4abc43b324d0decc28d6e609e927f0a50321af4a

wrap.py

@@ -126,7 +126,10 @@ class Resolver:
             try:
                 import lzma
                 del lzma
+                try:
                     shutil.register_unpack_format('xztar', ['.tar.xz', '.txz'], shutil._unpack_tarfile, [], "xz'ed tar-file")
+                except shutil.RegistryError:
+                    pass
             except ImportError:
                 pass
         if os.path.isdir(os.path.join(self.subdir_root, package.get('directory'))):