diff options
| author | Bedarkar, Malhar <malhar.bedarkar@cirrus.com> | 2018-03-07 18:41:05 -0600 |
|---|---|---|
| committer | Bedarkar, Malhar <malhar.bedarkar@cirrus.com> | 2018-03-07 18:41:05 -0600 |
| commit | 93bdbc3162213bec9ce47303c780531e50da1ff8 (patch) | |
| tree | 72962802421b9267b9434ba3bbbc774f217b0fff /mesonbuild/wrap/wrap.py | |
| parent | a470835778b4a9813e8a6046e04a958755797347 (diff) | |
| download | meson-93bdbc3162213bec9ce47303c780531e50da1ff8.zip meson-93bdbc3162213bec9ce47303c780531e50da1ff8.tar.gz meson-93bdbc3162213bec9ce47303c780531e50da1ff8.tar.bz2 | |
Backed out changes to Wrap.py to add support for Gerrit
Added cross_test_log.txt for review
Change-Id: I6af9c4926dc8a63fa030ae7fe28868bf772d2099
Diffstat (limited to 'mesonbuild/wrap/wrap.py')
| -rw-r--r-- | mesonbuild/wrap/wrap.py | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/mesonbuild/wrap/wrap.py b/mesonbuild/wrap/wrap.py index a3f8ab1..54a928e 100644 --- a/mesonbuild/wrap/wrap.py +++ b/mesonbuild/wrap/wrap.py @@ -203,17 +203,15 @@ class Resolver: subprocess.call(['git', 'pull'], cwd=checkoutdir) else: if subprocess.call(['git', 'checkout', revno], cwd=checkoutdir) != 0: - subprocess.check_call(['git', 'fetch', p.get('url'), revno], cwd=checkoutdir) + subprocess.check_call(['git', 'fetch'], 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': - 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) + 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', |