[sagemath] 02/02: Fix the common.conf patch so that pre-install tests work too

[Ximin Luo]

This is an automated email from the git hooks/post-receive script.

infinity0 pushed a commit to branch master
in repository sagemath.

commit 348804e5263adb76b7a9a9e66272bde93d2d0cd8
Author: Ximin Luo <infinity0 at debian.org>
Date:   Sun Dec 18 14:15:41 2016 +0100

    Fix the common.conf patch so that pre-install tests work too
---
 debian/patches/dt-work-around-doc-common-conf.patch | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/debian/patches/dt-work-around-doc-common-conf.patch b/debian/patches/dt-work-around-doc-common-conf.patch
index 37bb1b6..46a7b52 100644
--- a/debian/patches/dt-work-around-doc-common-conf.patch
+++ b/debian/patches/dt-work-around-doc-common-conf.patch
@@ -35,16 +35,16 @@ This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
  import shutil
  from tempfile import mkdtemp
 -from sage.env import SAGE_DOC_SRC
-+from sage.env import SAGE_LIB
++from sage.env import SAGE_DOC_SRC, SAGE_LIB
  from sphinx.application import Sphinx
  
  
-@@ -78,7 +78,7 @@
- 
+@@ -79,6 +79,8 @@
      # Sphinx constructor: Sphinx(srcdir, confdir, outdir, doctreedir,
      # buildername, confoverrides, status, warning, freshenv).
--    confdir = os.path.join(SAGE_DOC_SRC, 'en', 'introspect')
-+    confdir = os.path.join(SAGE_LIB, 'sage', 'misc', 'docs', 'introspect')
+     confdir = os.path.join(SAGE_DOC_SRC, 'en', 'introspect')
++    if not os.path.exists(confdir):
++        confdir = os.path.join(SAGE_LIB, 'sage', 'misc', 'docs', 'introspect')
  
      doctreedir = os.path.join(srcdir, 'doctrees')
      confoverrides = {'html_context': {}, 'master_doc': 'docstring'}

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/sagemath.git