Created an emergency wraptool that downloads directly from Github.

ghwt.py

@@ -0,0 +1,107 @@
+#!/usr/bin/env python3
+
+# Copyright 2016 The Meson development team
+
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+
+#     http://www.apache.org/licenses/LICENSE-2.0
+
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+import urllib.request, json, sys, os, shutil, subprocess
+import configparser, hashlib
+
+private_repos = {'meson', 'wrapweb', 'meson-ci'}
+
+def gh_get(url):
+    r = urllib.request.urlopen(url)
+    jd = json.loads(r.read().decode('utf-8'))
+    return jd
+
+def list_projects():
+    jd = gh_get('https://api.github.com/orgs/mesonbuild/repos')
+    entries = [entry['name'] for entry in jd]
+    entries = [e for e in entries if e not in private_repos]
+    entries.sort()
+    for i in entries:
+        print(i)
+    return 0
+
+def unpack(sproj, branch, outdir):
+    subprocess.check_call(['git', 'clone', '-b', branch, 'https://github.com/mesonbuild/%s.git' % sproj, outdir])
+    usfile = os.path.join(outdir, 'upstream.wrap')
+    assert(os.path.isfile(usfile))
+    config = configparser.ConfigParser()
+    config.read(usfile)
+    us_url = config['wrap-file']['source_url']
+    us = urllib.request.urlopen(us_url).read()
+    h = hashlib.sha256()
+    h.update(us)
+    dig = h.hexdigest()
+    should = config['wrap-file']['source_hash']
+    if dig != should:
+        print('Incorrect hash on download.')
+        print(' expected:', dig)
+        print(' obtained:', should)
+        return 1
+    spdir = os.path.split(outdir)[0]
+    ofilename = os.path.join(spdir, config['wrap-file']['source_filename'])
+    ofile = open(ofilename, 'wb')
+    ofile.write(us)
+    if 'lead_directory_missing' in config['wrap-file']:
+        os.mkdir(outdir)
+        shutil.unpack_archive(ofilename, outdir)
+    else:
+        shutil.unpack_archive(ofilename, spdir)
+        extdir = os.path.join(spdir, config['wrap-file']['directory'])
+        assert(os.path.isdir(extdir))
+        shutil.move(os.path.join(outdir, '.git'), extdir)
+        subprocess.check_call(['git', 'reset', '--hard'], cwd=extdir)
+        shutil.rmtree(outdir)
+        shutil.move(extdir, outdir)
+    shutil.rmtree(os.path.join(outdir, '.git'))
+    os.unlink(ofilename)
+
+def install(sproj):
+    sproj_dir = os.path.join('subprojects', sproj)
+    if not os.path.isdir('subprojects'):
+        print('Run this in your source root and make sure there is a subprojects directory in it.')
+        return 1
+    if os.path.isdir(sproj_dir):
+        print('Subproject is already there. To update, nuke the dir and reinstall.')
+        return 1
+    blist = gh_get('https://api.github.com/repos/mesonbuild/%s/branches' % sproj)
+    blist = [b['name'] for b in blist]
+    blist = [b for b in blist if b != 'master']
+    blist.sort()
+    branch = blist[-1]
+    print('Using branch', branch)
+    return unpack(sproj, branch, sproj_dir)
+
+def run(args):
+    if len(args) == 0 or args[0] == '-h' or args[0] == '--help':
+        print(sys.argv[0], 'list/install', 'package_name')
+        return 1
+    command = args[0]
+    args = args[1:]
+    if command == 'list':
+        list_projects()
+        return 0
+    elif command == 'install':
+        if len(args) != 1:
+            print('Install requires exactly one argument.')
+            return 1
+        return install(args[0])
+    else:
+        print('Unknown command')
+        return 1
+
+if __name__ == '__main__':
+    print('This is an emergency wrap downloader. Use only when wrapdb is down.')
+    sys.exit(run(sys.argv[1:]))

mesonbuild/wrap/wrap.py

@@ -90,10 +90,11 @@ class Resolver:
     def resolve(self, packagename):
         fname = os.path.join(self.subdir_root, packagename + '.wrap')
         dirname = os.path.join(self.subdir_root, packagename)
+        if os.path.isdir(dirname):
+            # The directory is there? Great, use it.
+            return packagename 
         if not os.path.isfile(fname):
-            if os.path.isdir(dirname):
-                # No wrap file but dir exists -> user put it there manually.
-                return packagename 
+            # No wrap file with this name? Give up.
             return None
         p = PackageDefinition(fname)
         if p.type == 'file':