From 80249e7190cd28cd3dad49f660ea202b7fc9fdef Mon Sep 17 00:00:00 2001 From: "Andrii Doroshenko (Xrayez)" Date: Fri, 10 Jul 2020 15:57:53 +0300 Subject: [PATCH] Expand env vars for `custom_modules` build option The order of conversion is also changed to ensure that the resulting path can be properly validated later on. --- methods.py | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/methods.py b/methods.py index ca6756f95fd..7b853b7821b 100644 --- a/methods.py +++ b/methods.py @@ -217,14 +217,15 @@ void unregister_module_types() { def convert_custom_modules_path(path): if not path: return path + path = os.path.realpath(os.path.expanduser(os.path.expandvars(path))) err_msg = "Build option 'custom_modules' must %s" if not os.path.isdir(path): raise ValueError(err_msg % "point to an existing directory.") - if os.path.realpath(path) == os.path.realpath("modules"): + if path == os.path.realpath("modules"): raise ValueError(err_msg % "be a directory other than built-in `modules` directory.") if is_module(path): raise ValueError(err_msg % "point to a directory with modules, not a single module.") - return os.path.realpath(os.path.expanduser(path)) + return path def disable_module(self):