diff options
| author | liugang <galen.gang.liu@gmail.com> | 2017-09-23 13:53:27 +0800 |
|---|---|---|
| committer | liugang <galen.gang.liu@gmail.com> | 2017-09-23 13:53:27 +0800 |
| commit | 7060b157739b63e2ff384528119cb0548d101e7a (patch) | |
| tree | 12753f0049b070a771cf3f8aac67958b44b3532d | |
| parent | bea6b1a6f64d93a0f4dc129d209cbc49b5e39df4 (diff) | |
| download | meson-7060b157739b63e2ff384528119cb0548d101e7a.zip meson-7060b157739b63e2ff384528119cb0548d101e7a.tar.gz meson-7060b157739b63e2ff384528119cb0548d101e7a.tar.bz2 | |
fix patch archive never download on some case
Fix issue #2359
| -rw-r--r-- | mesonbuild/wrap/wrap.py | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/mesonbuild/wrap/wrap.py b/mesonbuild/wrap/wrap.py index 933bbd5..ea738f7 100644 --- a/mesonbuild/wrap/wrap.py +++ b/mesonbuild/wrap/wrap.py @@ -272,16 +272,16 @@ class Resolver: ofname = os.path.join(self.cachedir, p.get('source_filename')) if os.path.exists(ofname): mlog.log('Using', mlog.bold(packagename), 'from cache.') - return - srcurl = p.get('source_url') - mlog.log('Downloading', mlog.bold(packagename), 'from', mlog.bold(srcurl)) - srcdata = self.get_data(srcurl) - dhash = self.get_hash(srcdata) - expected = p.get('source_hash') - if dhash != expected: - raise RuntimeError('Incorrect hash for source %s:\n %s expected\n %s actual.' % (packagename, expected, dhash)) - with open(ofname, 'wb') as f: - f.write(srcdata) + else: + srcurl = p.get('source_url') + mlog.log('Downloading', mlog.bold(packagename), 'from', mlog.bold(srcurl)) + srcdata = self.get_data(srcurl) + dhash = self.get_hash(srcdata) + expected = p.get('source_hash') + if dhash != expected: + raise RuntimeError('Incorrect hash for source %s:\n %s expected\n %s actual.' % (packagename, expected, dhash)) + with open(ofname, 'wb') as f: + f.write(srcdata) if p.has_patch(): purl = p.get('patch_url') mlog.log('Downloading patch from', mlog.bold(purl)) |