From 37c4cb360afc7930cf7cd5c09709fb7cd1604ed9 Mon Sep 17 00:00:00 2001 From: David Baumgold Date: Wed, 26 Mar 2014 15:14:17 -0400 Subject: [PATCH] Help paver find the theme directory --- pavelib/assets.py | 3 ++- pavelib/utils/envs.py | 16 ++++++++++------ 2 files changed, 12 insertions(+), 7 deletions(-) diff --git a/pavelib/assets.py b/pavelib/assets.py index 62f629229c..41513cc153 100644 --- a/pavelib/assets.py +++ b/pavelib/assets.py @@ -22,7 +22,8 @@ def theme_sass_paths(): if edxapp_env.feature_flags.get('USE_CUSTOM_THEME', False): theme_name = edxapp_env.env_tokens.get('THEME_NAME', '') - theme_root = path(edxapp_env.REPO_ROOT).dirname() / "themes" / theme_name + parent_dir = path(edxapp_env.REPO_ROOT).abspath().parent + theme_root = parent_dir / "themes" / theme_name return [theme_root / "static" / "sass"] else: diff --git a/pavelib/utils/envs.py b/pavelib/utils/envs.py index 756fc4216f..6bae44bd7b 100644 --- a/pavelib/utils/envs.py +++ b/pavelib/utils/envs.py @@ -15,7 +15,7 @@ class Env(object): """ # Root of the git repository (edx-platform) - REPO_ROOT = path(__file__).dirname().dirname().dirname() + REPO_ROOT = path(__file__).parent.parent.parent # Service variant (lms, cms, etc.) configured with an environment variable # We use this to determine which envs.json file to load. @@ -29,12 +29,16 @@ class Env(object): """ # Find the env JSON file - env_path = "env.json" - if self.SERVICE_VARIANT is not None: - env_path = self.REPO_ROOT.dirname() / "{service}.env.json".format(service=self.SERVICE_VARIANT) + if self.SERVICE_VARIANT: + env_path = self.REPO_ROOT.parent / "{service}.env.json".format(service=self.SERVICE_VARIANT) + else: + env_path = path("env.json").abspath() - # If the file does not exist, issue a warning and return an empty dict - if not os.path.isfile(env_path): + # If the file does not exist, here or one level up, + # issue a warning and return an empty dict + if not env_path.isfile(): + env_path = env_path.parent.parent / env_path.basename() + if not env_path.isfile(): print( "Warning: could not find environment JSON file " "at '{path}'".format(path=env_path),