diff options
| author | Jussi Pakkanen <jpakkane@gmail.com> | 2016-05-05 23:18:05 +0300 |
|---|---|---|
| committer | Jussi Pakkanen <jpakkane@gmail.com> | 2016-05-05 23:18:05 +0300 |
| commit | eb6548a816b7895a46b7203eb6be24f786371b40 (patch) | |
| tree | e34ad849a66f6ab6960fbb6b01fa3d105a6d7207 /mesonbuild/wrap/wrap.py | |
| parent | 8d73d3023aa150c60e4335280eb8684f20998725 (diff) | |
| download | meson-eb6548a816b7895a46b7203eb6be24f786371b40.zip meson-eb6548a816b7895a46b7203eb6be24f786371b40.tar.gz meson-eb6548a816b7895a46b7203eb6be24f786371b40.tar.bz2 | |
Created an emergency wraptool that downloads directly from Github.
Diffstat (limited to 'mesonbuild/wrap/wrap.py')
| -rw-r--r-- | mesonbuild/wrap/wrap.py | 7 |
1 files changed, 4 insertions, 3 deletions
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': |