diff options
author | Jacob Mason <jacoblmason@gmail.com> | 2010-08-14 20:13:55 -0500 |
---|---|---|
committer | Jacob Mason <jacoblmason@gmail.com> | 2010-08-14 20:13:55 -0500 |
commit | 06d50c45aad20ff9e14fabd68cfbe6e0c2c0992c (patch) | |
tree | 413d74f5591fecbb04f13e3fb6d2e57a9d782b79 /sphinx/builders/websupport.py | |
parent | d11e70518205f25b71414f3ea1972182f603b684 (diff) | |
download | sphinx-git-06d50c45aad20ff9e14fabd68cfbe6e0c2c0992c.tar.gz |
remove old static dirs if they exist already
Diffstat (limited to 'sphinx/builders/websupport.py')
-rw-r--r-- | sphinx/builders/websupport.py | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/sphinx/builders/websupport.py b/sphinx/builders/websupport.py index 59bfd7c86..283cff4fc 100644 --- a/sphinx/builders/websupport.py +++ b/sphinx/builders/websupport.py @@ -173,13 +173,13 @@ class WebSupportBuilder(StandaloneHTMLBuilder): StandaloneHTMLBuilder.handle_finish(self) directories = ['_images', '_static'] for directory in directories: - try: - shutil.move(path.join(self.outdir, directory), - path.join(self.app.builddir, self.app.staticdir, - directory)) - except IOError: - # in case any of these directories don't exist - pass + src = path.join(self.outdir, directory) + dst = path.join(self.app.builddir, self.app.staticdir, directory) + if path.isdir(src): + if path.isdir(dst): + shutil.rmtree(dst) + shutil.move(src, dst) + for root, dirs, files in os.walk(self.doctreedir): for fn in files: fp = path.join(root, fn) |