From eb6548a816b7895a46b7203eb6be24f786371b40 Mon Sep 17 00:00:00 2001 From: Jussi Pakkanen Date: Thu, 5 May 2016 23:18:05 +0300 Subject: Created an emergency wraptool that downloads directly from Github. --- mesonbuild/wrap/wrap.py | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) (limited to 'mesonbuild') diff --git a/mesonbuild/wrap/wrap.py b/mesonbuild/wrap/wrap.py index ad8f106..6e3383c 100644 --- a/mesonbuild/wrap/wrap.py +++ b/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': -- cgit v1.1