diff options
| author | Bedarkar, Malhar <malhar.bedarkar@cirrus.com> | 2018-03-05 18:26:39 -0600 |
|---|---|---|
| committer | Bedarkar, Malhar <malhar.bedarkar@cirrus.com> | 2018-03-05 18:26:39 -0600 |
| commit | a2ee76228e29f4cf5f52197dd2a726620445c81b (patch) | |
| tree | c1436fc968d8b69c241a91316ec72cc4557c96dc /mesonbuild/wrap/wrap.py | |
| parent | 7842bc03dd581c4beaa1b94746b5dfe5d38986c6 (diff) | |
| download | meson-a2ee76228e29f4cf5f52197dd2a726620445c81b.zip meson-a2ee76228e29f4cf5f52197dd2a726620445c81b.tar.gz meson-a2ee76228e29f4cf5f52197dd2a726620445c81b.tar.bz2 | |
First cut of ARMCC support for MESON.
Change-Id: I15d8258e84d392baaccb8f670e33eefcfe8cd49a
Diffstat (limited to 'mesonbuild/wrap/wrap.py')
| -rw-r--r-- | mesonbuild/wrap/wrap.py | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/mesonbuild/wrap/wrap.py b/mesonbuild/wrap/wrap.py index 54a928e..a3f8ab1 100644 --- a/mesonbuild/wrap/wrap.py +++ b/mesonbuild/wrap/wrap.py @@ -203,15 +203,17 @@ class Resolver: subprocess.call(['git', 'pull'], cwd=checkoutdir) else: if subprocess.call(['git', 'checkout', revno], cwd=checkoutdir) != 0: - subprocess.check_call(['git', 'fetch'], cwd=checkoutdir) + subprocess.check_call(['git', 'fetch', p.get('url'), revno], cwd=checkoutdir) subprocess.check_call(['git', 'checkout', revno], cwd=checkoutdir) else: subprocess.check_call(['git', 'clone', p.get('url'), p.get('directory')], cwd=self.subdir_root) if revno.lower() != 'head': - subprocess.check_call(['git', 'checkout', revno], - cwd=checkoutdir) + if subprocess.call(['git', 'checkout', revno], cwd=checkoutdir) != 0: + subprocess.check_call(['git', 'fetch', p.get('url'), revno], cwd=checkoutdir) + subprocess.check_call(['git', 'checkout', revno], + cwd=checkoutdir) push_url = p.values.get('push-url') if push_url: subprocess.check_call(['git', 'remote', 'set-url', |