aboutsummaryrefslogtreecommitdiff
path: root/mesonbuild/minstall.py
diff options
context:
space:
mode:
authorXavier Claessens <xavier.claessens@collabora.com>2022-02-22 15:14:58 -0500
committerXavier Claessens <xclaesse@gmail.com>2022-02-28 09:03:27 -0500
commit6fafeb13b3b115b5fddf371b6b7624801559b99f (patch)
treef07d6d7546a19c07c6963774c585ab70ca5656f6 /mesonbuild/minstall.py
parent79c6075b560dbf1c3e4e0b30f1c472dc2086421e (diff)
downloadmeson-6fafeb13b3b115b5fddf371b6b7624801559b99f.zip
meson-6fafeb13b3b115b5fddf371b6b7624801559b99f.tar.gz
meson-6fafeb13b3b115b5fddf371b6b7624801559b99f.tar.bz2
devenv: Source bash completion scripts
Diffstat (limited to 'mesonbuild/minstall.py')
-rw-r--r--mesonbuild/minstall.py20
1 files changed, 10 insertions, 10 deletions
diff --git a/mesonbuild/minstall.py b/mesonbuild/minstall.py
index 75a3240..80b0239 100644
--- a/mesonbuild/minstall.py
+++ b/mesonbuild/minstall.py
@@ -127,6 +127,15 @@ class DirMaker:
append_to_log(self.lf, d)
+def load_install_data(fname: str) -> InstallData:
+ with open(fname, 'rb') as ifile:
+ obj = pickle.load(ifile)
+ if not isinstance(obj, InstallData) or not hasattr(obj, 'version'):
+ raise MesonVersionMismatchException('<unknown>', coredata_version)
+ if major_versions_differ(obj.version, coredata_version):
+ raise MesonVersionMismatchException(obj.version, coredata_version)
+ return obj
+
def is_executable(path: str, follow_symlinks: bool = False) -> bool:
'''Checks whether any of the "x" bits are set in the source file mode.'''
return bool(os.stat(path, follow_symlinks=follow_symlinks).st_mode & 0o111)
@@ -510,17 +519,8 @@ class Installer:
self.do_copyfile(abs_src, abs_dst)
self.set_mode(abs_dst, install_mode, data.install_umask)
- @staticmethod
- def check_installdata(obj: InstallData) -> InstallData:
- if not isinstance(obj, InstallData) or not hasattr(obj, 'version'):
- raise MesonVersionMismatchException('<unknown>', coredata_version)
- if major_versions_differ(obj.version, coredata_version):
- raise MesonVersionMismatchException(obj.version, coredata_version)
- return obj
-
def do_install(self, datafilename: str) -> None:
- with open(datafilename, 'rb') as ifile:
- d = self.check_installdata(pickle.load(ifile))
+ d = load_install_data(datafilename)
destdir = self.options.destdir
if destdir is None: