From: Gervase Markham <gerv@gerv.net>
Date: Mon, 11 May 2015 18:02:45 +0000 (+0100)
Subject: Bug 1144086 - Move extension docs assembly from makedocs.pl to conf.py. r=dkl,a=glob
X-Git-Tag: release-5.1.1~253
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=bd41649cf11a5bd06ba07ac46ed5795f2adb1978;p=thirdparty%2Fbugzilla.git

Bug 1144086 - Move extension docs assembly from makedocs.pl to conf.py. r=dkl,a=glob
---

diff --git a/docs/en/rst/conf.py b/docs/en/rst/conf.py
index c8be24e49a..a5c6090e9f 100644
--- a/docs/en/rst/conf.py
+++ b/docs/en/rst/conf.py
@@ -400,6 +400,10 @@ ext_dir = "../../../extensions"
 if (os.path.isdir(ext_dir)):
     # Clear out old extensions docs
     for dir in os.listdir("extensions"):
+        # A .gitignore file is required as git doesn't like empty directories
+        if dir == ".gitignore":
+            continue
+
         shutil.rmtree(os.path.join("extensions", dir))
 
     # Copy in new copies