Merge pull request #38 from Holzhaus/fix-config-restore

sphinx: Fix restoring of previous config values

sphinx_multiversion/main.py

@@ -284,7 +284,7 @@ def main(argv=None):
                 "outputdir": os.path.join(
                     os.path.abspath(args.outputdir), outputdir
                 ),
-                "confdir": confdir_absolute,
+                "confdir": confpath,
                 "docnames": list(project.discover()),
             }
 
@@ -320,7 +320,7 @@ def main(argv=None):
                     "-D",
                     "smv_current_version={}".format(version_name),
                     "-c",
-                    data["confdir"],
+                    confdir_absolute,
                     data["sourcedir"],
                     data["outputdir"],
                     *args.filenames,

sphinx_multiversion/sphinx.py

@@ -170,11 +170,11 @@ def config_inited(app, config):
     app.connect("html-page-context", html_page_context)
 
     # Restore config values
-    old_config = sphinx_config.Config.read(app.confdir)
+    old_config = sphinx_config.Config.read(data["confdir"])
     old_config.pre_init_values()
     old_config.init_values()
-    config.version = old_config.version
-    config.release = old_config.release
+    config.version = data["version"]
+    config.release = data["release"]
     config.today = old_config.today
     if not config.today:
         config.today = sphinx_i18n.format_date(