From 05ee235086d919597e984cb77d0d242ffb855096 Mon Sep 17 00:00:00 2001 From: Ximin Luo Date: Sat, 11 Mar 2017 18:08:04 +0100 Subject: [PATCH] docbuild: More reliable way of trying to remove static_dir --- src/sage_setup/docbuild/ext/multidocs.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/sage_setup/docbuild/ext/multidocs.py b/src/sage_setup/docbuild/ext/multidocs.py index 63dbb712616..80c2537a18e 100644 --- a/src/sage_setup/docbuild/ext/multidocs.py +++ b/src/sage_setup/docbuild/ext/multidocs.py @@ -284,10 +284,10 @@ def copy_static_files(self): app.builder.info(bold('linking _static directory.')) static_dir = os.path.join(app.builder.outdir, '_static') master_static_dir = os.path.join('..', '_static') - if os.path.exists(static_dir): - if os.path.isdir(static_dir) and not os.path.islink(static_dir): + if os.path.lexists(static_dir): + try: shutil.rmtree(static_dir) - else: + except OSError: os.unlink(static_dir) os.symlink(master_static_dir, static_dir)