diff options
author | Nirbheek Chauhan <nirbheek@centricular.com> | 2018-02-10 01:08:06 +0530 |
---|---|---|
committer | Nirbheek Chauhan <nirbheek@centricular.com> | 2018-02-10 01:11:41 +0530 |
commit | 4efa7b7fe355b0eb3aa1952e815a4f75b5f0d708 (patch) | |
tree | bdc007ec26dd00143665ff2b4134878858400416 | |
parent | c267564a154de051baa8d05dfd88bb1dbbfd4eb2 (diff) | |
download | meson-nirbheek/wrap-handle-submodule-status.tar.gz |
wrap: Handle more submodule status casesnirbheek/wrap-handle-submodule-status
The '+' and 'U' cases should not happen normally because we don't run
any git commands if the subproject directory exists and contains
a meson build file. However, if the user accidentally messed up the
subproject checkout to a version that had no build files, we would
error out with an assertion.
-rw-r--r-- | mesonbuild/wrap/wrap.py | 13 |
1 files changed, 8 insertions, 5 deletions
diff --git a/mesonbuild/wrap/wrap.py b/mesonbuild/wrap/wrap.py index 26a348981..bd440a135 100644 --- a/mesonbuild/wrap/wrap.py +++ b/mesonbuild/wrap/wrap.py @@ -164,17 +164,20 @@ class Resolver: if not ret: return False # Submodule has not been added, add it - if out.startswith(b'-'): + if out.startswith(b'+'): + mlog.warning('submodule {} might be out of date'.format(dirname)) + return True + elif out.startswith(b'U'): + raise RuntimeError('submodule {} has merge conflicts'.format(dirname)) + elif out.startswith(b'-'): if subprocess.call(['git', '-C', self.subdir_root, 'submodule', 'update', '--init', dirname]) != 0: return False # Submodule was added already, but it wasn't populated. Do a checkout. elif out.startswith(b' '): if subprocess.call(['git', 'checkout', '.'], cwd=dirname): return True - else: - m = 'Unknown git submodule output: {!r}' - raise AssertionError(m.format(out)) - return True + m = 'Unknown git submodule output: {!r}' + raise RuntimeError(m.format(out)) def get_git(self, p): checkoutdir = os.path.join(self.subdir_root, p.get('directory')) |