diff --git a/cms/envs/common.py b/cms/envs/common.py index 4df4e08f00..82d625025d 100644 --- a/cms/envs/common.py +++ b/cms/envs/common.py @@ -37,7 +37,7 @@ from path import path from warnings import simplefilter from lms.djangoapps.lms_xblock.mixin import LmsBlockMixin -from dealer.git import git +import dealer.git from xmodule.modulestore.edit_info import EditInfoMixin ############################ FEATURE CONFIGURATION ############################# @@ -296,7 +296,12 @@ MANAGERS = ADMINS EDX_PLATFORM_REVISION = os.environ.get('EDX_PLATFORM_REVISION') if not EDX_PLATFORM_REVISION: - EDX_PLATFORM_REVISION = git.revision + try: + # Get git revision of the current file + EDX_PLATFORM_REVISION = dealer.git.Backend(path=REPO_ROOT).revision + except TypeError: + # Not a git repository + EDX_PLATFORM_REVISION = 'unknown' # Static content STATIC_URL = '/static/' + EDX_PLATFORM_REVISION + "/" diff --git a/lms/envs/common.py b/lms/envs/common.py index 5d3f1fe9a4..7cd6c60ae0 100644 --- a/lms/envs/common.py +++ b/lms/envs/common.py @@ -33,7 +33,7 @@ from warnings import simplefilter from django.utils.translation import ugettext_lazy as _ from .discussionsettings import * -from dealer.git import git +import dealer.git from xmodule.modulestore.modulestore_settings import update_module_store_settings from lms.djangoapps.lms_xblock.mixin import LmsBlockMixin @@ -688,7 +688,12 @@ MANAGERS = ADMINS EDX_PLATFORM_REVISION = os.environ.get('EDX_PLATFORM_REVISION') if not EDX_PLATFORM_REVISION: - EDX_PLATFORM_REVISION = git.revision + try: + # Get git revision of the current file + EDX_PLATFORM_REVISION = dealer.git.Backend(path=REPO_ROOT).revision + except TypeError: + # Not a git repository + EDX_PLATFORM_REVISION = 'unknown' # Static content STATIC_URL = '/static/' diff --git a/requirements/edx/base.txt b/requirements/edx/base.txt index 8bf2418a02..9a42af8aed 100644 --- a/requirements/edx/base.txt +++ b/requirements/edx/base.txt @@ -11,7 +11,7 @@ html5lib==0.999 boto==2.32.1 celery==3.0.19 cssselect==0.9.1 -dealer==0.2.3 +dealer==2.0.4 defusedxml==0.4.1 distribute>=0.6.28, <0.7 django-babel-underscore==0.1.0