aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEli Schwartz <eschwartz@archlinux.org>2021-10-04 21:21:20 -0400
committerXavier Claessens <xclaesse@gmail.com>2021-10-10 10:17:55 -0400
commit352380f6598b0472e852d2f50669aa13874d2ac9 (patch)
treed62d11e7ead53b628f01acd6451dde87d5ad3be9
parent95d8b8787a2dd01e0abb40f7088e706e204a859f (diff)
downloadmeson-352380f6598b0472e852d2f50669aa13874d2ac9.zip
meson-352380f6598b0472e852d2f50669aa13874d2ac9.tar.gz
meson-352380f6598b0472e852d2f50669aa13874d2ac9.tar.bz2
Revert "msubprojects: if fetching the remote fails, gracefully fallback to local copy"
This reverts commit 4568482316f63c48559b97c9a4771740ed61eca6. As it turns out, the rationale for this was completely bogus. This command doesn't re-apply the patch_directory etc. and in fact there is no command whatsoever that does this. So, this command does not have two purposes, and we are not making one of them more robust -- instead it has one purpose, and we are making it lie about whether it failed. Instead of trying to freeload off of this command, we will just add another command to properly apply patch overlays.
-rwxr-xr-xmesonbuild/msubprojects.py11
1 files changed, 3 insertions, 8 deletions
diff --git a/mesonbuild/msubprojects.py b/mesonbuild/msubprojects.py
index dfcff01..293d43d 100755
--- a/mesonbuild/msubprojects.py
+++ b/mesonbuild/msubprojects.py
@@ -267,14 +267,9 @@ class Runner:
self.git_output(['fetch', '--refmap', heads_refmap, '--refmap', tags_refmap, 'origin', revision])
except GitException as e:
self.log(' -> Could not fetch revision', mlog.bold(revision), 'in', mlog.bold(self.repo_dir))
- if quiet_git(['rev-parse', revision + '^{commit}'], self.repo_dir)[0]:
- self.log(mlog.yellow('WARNING:'), 'Proceeding with locally available copy')
- # Trick git into setting FETCH_HEAD from the local revision.
- quiet_git(['fetch', '.', revision], self.repo_dir)
- else:
- self.log(mlog.red(e.output))
- self.log(mlog.red(str(e)))
- return False
+ self.log(mlog.red(e.output))
+ self.log(mlog.red(str(e)))
+ return False
if branch == '':
# We are currently in detached mode