aboutsummaryrefslogtreecommitdiff
path: root/mesonbuild/environment.py
diff options
context:
space:
mode:
authorZbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl>2020-08-03 11:14:52 +0200
committerJussi Pakkanen <jpakkane@gmail.com>2020-08-04 17:15:37 +0300
commit6006987ce5081534a129ee2d9d55d993c7a76b29 (patch)
tree2fd7fc8455336f6c6a8286dd2e0fcb073426e0d1 /mesonbuild/environment.py
parent2d218c289a6e95790c21106fe00655aa9f947f55 (diff)
downloadmeson-6006987ce5081534a129ee2d9d55d993c7a76b29.zip
meson-6006987ce5081534a129ee2d9d55d993c7a76b29.tar.gz
meson-6006987ce5081534a129ee2d9d55d993c7a76b29.tar.bz2
"Downgrade" warning when regenerating after version bump
There is nothing to "warn" about, this is a completely routine occurence. OTOH, when something is corrupted, we should warn. Keep the red color and "WARNING:" prefix in that case. Example output: $ ninja -C build Regenerating configuration from scratch: Build directory has been generated with Meson version 0.55.999, which is incompatible with current version 0.56.0. The Meson build system Version: 0.56.0 ...
Diffstat (limited to 'mesonbuild/environment.py')
-rw-r--r--mesonbuild/environment.py5
1 files changed, 5 insertions, 0 deletions
diff --git a/mesonbuild/environment.py b/mesonbuild/environment.py
index 01fc8e4..6987863 100644
--- a/mesonbuild/environment.py
+++ b/mesonbuild/environment.py
@@ -523,6 +523,11 @@ class Environment:
self.first_invocation = False
except FileNotFoundError:
self.create_new_coredata(options)
+ except coredata.MesonVersionMismatchException as e:
+ # This is routine, but tell the user the update happened
+ mlog.log('Regenerating configuration from scratch:', str(e))
+ coredata.read_cmd_line_file(self.build_dir, options)
+ self.create_new_coredata(options)
except MesonException as e:
# If we stored previous command line options, we can recover from
# a broken/outdated coredata.