From c53268e8fe616b963ff25a05da8ee60f23115f62 Mon Sep 17 00:00:00 2001 From: Nicolas F Date: Thu, 25 Jun 2020 00:17:12 +0200 Subject: [PATCH] assetmanager: don't choke on existing icons dir Fixes #1789. --- overviewer_core/assetmanager.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/overviewer_core/assetmanager.py b/overviewer_core/assetmanager.py index bb02e7f..446819b 100644 --- a/overviewer_core/assetmanager.py +++ b/overviewer_core/assetmanager.py @@ -175,8 +175,9 @@ top-level directory. force_writable=True) # 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 - 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) try: os.symlink("markers", "icons", target_is_directory=True, dir_fd=od_fd)