From c947cfaf5765215bee547fcd14ca1ae0fdb4d790 Mon Sep 17 00:00:00 2001 From: "Martin A. Brown" Date: Mon, 18 Apr 2016 12:25:20 -0700 Subject: [PATCH] and remove the build directory, if empty --- tldp/driver.py | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/tldp/driver.py b/tldp/driver.py index 9273305..678e104 100644 --- a/tldp/driver.py +++ b/tldp/driver.py @@ -228,13 +228,12 @@ def create_dtworkingdir(config, docs): return True, None -def post_publish_cleanup(docs): - '''clean up any doctype directories left in --builddir''' - dtworkingdirs = set([x.dtworkingdir for x in docs]) - for d in dtworkingdirs: +def post_publish_cleanup(workingdirs): + '''clean up empty directories left under --builddir''' + for d in workingdirs: if os.path.isdir(d): try: - logger.debug("removing doctype build dir %s", d) + logger.debug("removing build dir %s", d) os.rmdir(d) except OSError as e: if e.errno != errno.ENOTEMPTY: @@ -338,7 +337,9 @@ def publish(config, docs, **kwargs): logger.debug("%s removing old directory %s", source.stem, source.working.dirname) shutil.rmtree(source.working.dirname) - post_publish_cleanup(docs) + workingdirs = list(set([x.dtworkingdir for x in docs])) + workingdirs.append(config.builddir) + post_publish_cleanup(workingdirs) return os.EX_OK