diff options
| author | Zuul <zuul@review.opendev.org> | 2022-09-23 15:35:54 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2022-09-23 15:35:54 +0000 |
| commit | 7efc7b33830d26b0a61b237dbd5d4f4b69a69abe (patch) | |
| tree | 158b0118d328d021df4aaefe48025f6355241d17 | |
| parent | dcbc4424a62d00fd61c5e5e6c47900d01b2b9864 (diff) | |
| parent | 0e3a55252b04e8e81db7b0f5636fb6624824a5cb (diff) | |
| download | kolla-7efc7b33830d26b0a61b237dbd5d4f4b69a69abe.tar.gz kolla-7efc7b33830d26b0a61b237dbd5d4f4b69a69abe.zip | |
Merge "Python 3.8+ has better shutil.copytree()"
| -rwxr-xr-x | kolla/image/build.py | 11 |
1 files changed, 1 insertions, 10 deletions
diff --git a/kolla/image/build.py b/kolla/image/build.py index 546404ab5..b03bb55d7 100755 --- a/kolla/image/build.py +++ b/kolla/image/build.py @@ -744,16 +744,7 @@ class KollaWorker(object): ) def copy_dir(self, src, dest): - if not os.path.isdir(dest): - shutil.copytree(src, dest) - else: - for file in os.listdir(src): - src_path = os.path.join(src, file) - dest_path = os.path.join(dest, file) - if os.path.isdir(src_path): - self.copy_dir(src_path, dest_path) - else: - shutil.copy2(src_path, dest_path) + shutil.copytree(src, dest, dirs_exist_ok=True) def setup_working_dir(self): """Creates a working directory for use while building.""" |
