From a8f2f59c7d0f841322e3917f6d12ef6d22e1691f Mon Sep 17 00:00:00 2001 From: Georg Brandl Date: Sun, 22 Jun 2008 18:09:21 +0000 Subject: [PATCH] Remove target directories in the static path before copying them again. --- CHANGES | 2 ++ sphinx/builder.py | 8 ++++---- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/CHANGES b/CHANGES index a1e3c0ed4..b787d5ac5 100644 --- a/CHANGES +++ b/CHANGES @@ -114,6 +114,8 @@ Bugs fixed * The LaTeX writer now translates line blocks with ``\raggedright``, which plays nicer with tables. +* Fix bug with directories in the HTML builder static path. + Release 0.3 (May 6, 2008) ========================= diff --git a/sphinx/builder.py b/sphinx/builder.py index 8ee11edde..b712dc865 100644 --- a/sphinx/builder.py +++ b/sphinx/builder.py @@ -574,12 +574,12 @@ class StandaloneHTMLBuilder(Builder): if filename.startswith('.'): continue fullname = path.join(staticdirname, filename) + targetname = path.join(self.outdir, '_static', filename) if path.isfile(fullname): - shutil.copyfile(fullname, - path.join(self.outdir, '_static', filename)) + shutil.copyfile(fullname, targetname) elif path.isdir(fullname): - shutil.copytree(fullname, - path.join(self.outdir, '_static', filename)) + shutil.rmtree(targetname) + shutil.copytree(fullname, targetname) # add pygments style file f = open(path.join(self.outdir, '_static', 'pygments.css'), 'w') f.write(PygmentsBridge('html', self.config.pygments_style).get_stylesheet())