[rtems-docs commit] coverpage: Fix repeated entries.

Chris Johns chrisj at rtems.org
Fri Aug 11 03:46:48 UTC 2017


Module:    rtems-docs
Branch:    master
Commit:    feb68323b7eb47129ca999c0b12c8dc0eefd61fd
Changeset: http://git.rtems.org/rtems-docs/commit/?id=feb68323b7eb47129ca999c0b12c8dc0eefd61fd

Author:    Chris Johns <chrisj at rtems.org>
Date:      Fri Aug 11 03:42:55 2017 +0000

coverpage: Fix repeated entries.

Closes #2865.

---

 common/waf.py    | 4 ++--
 develenv/conf.py | 2 ++
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/common/waf.py b/common/waf.py
index 7947829..df32c71 100644
--- a/common/waf.py
+++ b/common/waf.py
@@ -378,17 +378,17 @@ def xml_catalogue(ctx, building):
     catalogue = {}
     sp = sys.path[:]
     for doc in building:
-        sys.path.insert(0, top_dir.find_node(doc).abspath())
         #
         # Import using the imp API so the module is reloaded for us.
         #
         import imp
+	sys.path = [top_dir.find_node(doc).abspath()]
         mf = imp.find_module('conf')
+        sys.path = sp[:]
         try:
             bconf = imp.load_module('bconf', mf[0], mf[1], mf[2])
         finally:
             mf[0].close()
-        sys.path = sp[:]
         catalogue[doc] = {
             'title': bconf.project,
             'version': str(ctx.env.VERSION),
diff --git a/develenv/conf.py b/develenv/conf.py
index 8a12a42..f902791 100644
--- a/develenv/conf.py
+++ b/develenv/conf.py
@@ -3,6 +3,8 @@ sys.path.append(os.path.abspath('../common/'))
 
 from conf import *
 
+project = "RTEMS Development Environment Guide"
+
 latex_documents = [
     ('index',
      'develenv.tex',



More information about the vc mailing list