浏览代码

Merge pull request #40257 from Xrayez/custom-modules-expandvars

Expand env vars for `custom_modules` build option
Rémi Verschelde 5 年之前
父节点
当前提交
70e21154f0
共有 1 个文件被更改,包括 3 次插入2 次删除
  1. 3 2
      methods.py

+ 3 - 2
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):