diff options
| author | Jussi Pakkanen <jpakkane@gmail.com> | 2016-08-25 22:28:42 +0300 |
|---|---|---|
| committer | Jussi Pakkanen <jpakkane@gmail.com> | 2016-08-25 22:29:40 +0300 |
| commit | 808451b5c72707ad83b2840d8f1759320d56d143 (patch) | |
| tree | 9f1e92f521762f47b348e9fc7987f0eb524e0ff8 | |
| parent | d3ce0a43954d41554882914372b13a15d76c70d5 (diff) | |
| download | meson-808451b5c72707ad83b2840d8f1759320d56d143.zip meson-808451b5c72707ad83b2840d8f1759320d56d143.tar.gz meson-808451b5c72707ad83b2840d8f1759320d56d143.tar.bz2 | |
Do not error out if git pull fails on subprojects. Closes #720.
| -rw-r--r-- | mesonbuild/wrap/wrap.py | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/mesonbuild/wrap/wrap.py b/mesonbuild/wrap/wrap.py index 6e3383c..bfb7ed4 100644 --- a/mesonbuild/wrap/wrap.py +++ b/mesonbuild/wrap/wrap.py @@ -114,7 +114,10 @@ class Resolver: is_there = os.path.isdir(checkoutdir) if is_there: if revno.lower() == 'head': - subprocess.check_call(['git', 'pull'], cwd=checkoutdir) + # Failure to do pull is not a fatal error, + # because otherwise you can't develop without + # a working net connection. + subprocess.call(['git', 'pull'], cwd=checkoutdir) else: if subprocess.call(['git', 'checkout', revno], cwd=checkoutdir) != 0: subprocess.check_call(['git', 'fetch'], cwd=checkoutdir) |