diff options
| author | Chris McDonough <chrism@plope.com> | 2012-05-09 09:31:30 -0400 |
|---|---|---|
| committer | Chris McDonough <chrism@plope.com> | 2012-05-09 09:31:30 -0400 |
| commit | 11fe8d003dc81901d8c9c5e12722ea6e44e4f151 (patch) | |
| tree | 17af9308f9ca4af065f8ca409438ae765acbbd27 /docs/conf.py | |
| parent | 25f3e44681459deff685b7b5c769d98f21532704 (diff) | |
| parent | f36a9018a4b20917c8cc748b93da279bfeed39d1 (diff) | |
| download | pyramid-11fe8d003dc81901d8c9c5e12722ea6e44e4f151.tar.gz pyramid-11fe8d003dc81901d8c9c5e12722ea6e44e4f151.tar.bz2 pyramid-11fe8d003dc81901d8c9c5e12722ea6e44e4f151.zip | |
Merge branch 'master' of github.com:Pylons/pyramid
Diffstat (limited to 'docs/conf.py')
| -rw-r--r-- | docs/conf.py | 15 |
1 files changed, 6 insertions, 9 deletions
diff --git a/docs/conf.py b/docs/conf.py index 21843933c..80ee0d2e5 100644 --- a/docs/conf.py +++ b/docs/conf.py @@ -133,18 +133,15 @@ if 'sphinx-build' in ' '.join(sys.argv): # protect against dumb importers from subprocess import call, Popen, PIPE p = Popen('which git', shell=True, stdout=PIPE) - git = p.stdout.read().strip() + cwd = os.getcwd() _themes = os.path.join(cwd, '_themes') - - if not os.path.isdir(_themes): - call([git, 'clone', 'git://github.com/Pylons/pylons_sphinx_theme.git', - '_themes']) + p = Popen('which git', shell=True, stdout=PIPE) + git = p.stdout.read().strip() + if not os.listdir(_themes): + call([git, 'submodule', '--init']) else: - os.chdir(_themes) - call([git, 'checkout', 'master']) - call([git, 'pull']) - os.chdir(cwd) + call([git, 'submodule', 'update']) sys.path.append(os.path.abspath('_themes')) |