[sagenb] 91/179: fix for SAGE_SRC not being in the environment for classic Sage

[felix salfelder]

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

felix-guest pushed a commit to branch master
in repository sagenb.

commit 6790641b54192d0d615d535b2e498627dea8ce0f
Author: R. Andrew Ohana <andrew.ohana at gmail.com>
Date:   Tue Apr 2 18:23:18 2013 -0700

    fix for SAGE_SRC not being in the environment for classic Sage
---
 flask_version/base.py | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/flask_version/base.py b/flask_version/base.py
index c253a27..b961186 100755
--- a/flask_version/base.py
+++ b/flask_version/base.py
@@ -6,7 +6,11 @@ from decorators import login_required, guest_or_login_required, with_lock
 from decorators import global_lock
 
 from flask.ext.autoindex import AutoIndex
-SRC = os.path.join(os.environ['SAGE_SRC'], 'sage')
+try:
+    from sage.env import SAGE_SRC
+except ImportError:
+    SAGE_SRC = os.environ.get('SAGE_SRC', os.path.join(os.environ['SAGE_ROOT'], 'devel', 'sage'))
+SRC = os.path.join(SAGE_SRC, 'sage')
 from flask.ext.openid import OpenID
 from flask.ext.babel import Babel, gettext, ngettext, lazy_gettext, get_locale
 from sagenb.misc.misc import SAGENB_ROOT, DATA, SAGE_DOC, translations_path

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