NgTech-LTD/gns3-server
2
0
Fork 0
mirror of https://github.com/GNS3/gns3-server.git synced 2025-01-18 23:43:48 +02:00
Code Issues Packages Projects Releases Wiki Activity

Fix tests

Browse Source
This commit is contained in:
grossmj 2022-12-30 10:01:43 +08:00
parent c56a8ef8f7
commit 3804249d89
2 changed files with 10 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
gns3server/controller/__init__.py
View File

@ -289,10 +289,11 @@ class Controller:
shutil.copy(os.path.join(resource_path, filename), os.path.join(dst_path, filename)) shutil.copy(os.path.join(resource_path, filename), os.path.join(dst_path, filename))
else: else:
for entry in importlib_resources.files('gns3server.configs').iterdir(): for entry in importlib_resources.files('gns3server.configs').iterdir():
full_path = os.path.join(dst_path, entry.name) if entry.is_file():
if entry.is_file() and not os.path.exists(full_path): full_path = os.path.join(dst_path, entry.name)
log.debug(f"Installing base config file {entry.name} to {full_path}") if not os.path.exists(full_path):
shutil.copy(str(entry), os.path.join(dst_path, entry.name)) log.debug(f"Installing base config file {entry.name} to {full_path}")
shutil.copy(str(entry), os.path.join(dst_path, entry.name))
except OSError as e: except OSError as e:
log.error(f"Could not install base config files to {dst_path}: {e}") log.error(f"Could not install base config files to {dst_path}: {e}")

9
gns3server/controller/appliance_manager.py
View File

@ -105,10 +105,11 @@ class ApplianceManager:
shutil.copy(os.path.join(resource_path, filename), os.path.join(dst_path, filename)) shutil.copy(os.path.join(resource_path, filename), os.path.join(dst_path, filename))
else: else:
for entry in importlib_resources.files('gns3server.appliances').iterdir(): for entry in importlib_resources.files('gns3server.appliances').iterdir():
full_path = os.path.join(dst_path, entry.name) if entry.is_file():
if entry.is_file() and not os.path.exists(full_path): full_path = os.path.join(dst_path, entry.name)
log.debug(f"Installing built-in appliance file {entry.name} to {full_path}") if not os.path.exists(full_path):
shutil.copy(str(entry), os.path.join(dst_path, entry.name)) log.debug(f"Installing built-in appliance file {entry.name} to {full_path}")
shutil.copy(str(entry), os.path.join(dst_path, entry.name))
except OSError as e: except OSError as e:
log.error(f"Could not install built-in appliance files to {dst_path}: {e}") log.error(f"Could not install built-in appliance files to {dst_path}: {e}")