LogalDeveloper/Minecraft-Overviewer
Archived
0
Fork 0
Code Activity

assetmanager: don't choke on existing icons dir

Browse Source 
Fixes #1789.
This commit is contained in:
Nicolas F
2020-06-25 00:17:12 +02:00
parent 780597d7b2
commit c53268e8fe
1 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
overviewer_core/assetmanager.py
View File

@@ -175,8 +175,9 @@ top-level directory.
force_writable=True) force_writable=True)
# symlink old icons dir because apache sux # symlink old icons dir because apache sux
iconsdir = os.path.join(self.outputdir, "icons")
if (os.name == "posix" and os.symlink in os.supports_dir_fd and if (os.name == "posix" and os.symlink in os.supports_dir_fd and
not os.path.islink(os.path.join(self.outputdir, "icons"))): not os.path.islink(iconsdir) and not os.path.isdir(iconsdir)):
od_fd = os.open(self.outputdir, os.O_DIRECTORY) od_fd = os.open(self.outputdir, os.O_DIRECTORY)
try: try:
os.symlink("markers", "icons", target_is_directory=True, dir_fd=od_fd) os.symlink("markers", "icons", target_is_directory=True, dir_fd=od_fd)