From c558ce1495b33f6ee3373aa2c7c733c13a29efef Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?R=C3=A9mi=20Verschelde?= Date: Thu, 25 Apr 2024 16:04:42 +0200 Subject: [PATCH] Mono: Replace distutils function with shutil equivalent Fixes #91154. (cherry picked from commit ee61ad46e743e2a350bb6e2f55b281c82f14d445) --- modules/mono/build_scripts/mono_configure.py | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/modules/mono/build_scripts/mono_configure.py b/modules/mono/build_scripts/mono_configure.py index bb305c55c3c..526dd122488 100644 --- a/modules/mono/build_scripts/mono_configure.py +++ b/modules/mono/build_scripts/mono_configure.py @@ -470,9 +470,8 @@ def copy_mono_root_files(env, mono_root): def copy_mono_etc_dir(mono_root, target_mono_config_dir, platform): - from distutils.dir_util import copy_tree from glob import glob - from shutil import copy + from shutil import copy, copytree if not os.path.isdir(target_mono_config_dir): os.makedirs(target_mono_config_dir) @@ -492,11 +491,11 @@ def copy_mono_etc_dir(mono_root, target_mono_config_dir, platform): if not mono_etc_dir: raise RuntimeError("Mono installation etc directory not found") - copy_tree(os.path.join(mono_etc_dir, "2.0"), os.path.join(target_mono_config_dir, "2.0")) - copy_tree(os.path.join(mono_etc_dir, "4.0"), os.path.join(target_mono_config_dir, "4.0")) - copy_tree(os.path.join(mono_etc_dir, "4.5"), os.path.join(target_mono_config_dir, "4.5")) + copytree(os.path.join(mono_etc_dir, "2.0"), os.path.join(target_mono_config_dir, "2.0")) + copytree(os.path.join(mono_etc_dir, "4.0"), os.path.join(target_mono_config_dir, "4.0")) + copytree(os.path.join(mono_etc_dir, "4.5"), os.path.join(target_mono_config_dir, "4.5")) if os.path.isdir(os.path.join(mono_etc_dir, "mconfig")): - copy_tree(os.path.join(mono_etc_dir, "mconfig"), os.path.join(target_mono_config_dir, "mconfig")) + copytree(os.path.join(mono_etc_dir, "mconfig"), os.path.join(target_mono_config_dir, "mconfig")) for file in glob(os.path.join(mono_etc_dir, "*")): if os.path.isfile(file):