Skip to content
This repository has been archived by the owner on May 28, 2019. It is now read-only.

Gn2 fix installation #89

Merged
merged 4 commits into from
Sep 30, 2013
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
4 changes: 2 additions & 2 deletions openquakeplatform/fabfile.py
Original file line number Diff line number Diff line change
Expand Up @@ -338,8 +338,8 @@ def _load_styles(app_name):
# Add styles:
styles_dir = 'gs_data/%s/styles' % app_name
styles_files = _collect(styles_dir)
sld_files = _collect(styles_dir, ext='sld')
for style, sld in zip(styles_files, sld_files):
for style in styles_files:
sld = os.path.splitext(style)[0] + ".sld"
# XML first:
_geoserver_api_from_file(
'styles.xml',
Expand Down
2 changes: 1 addition & 1 deletion openquakeplatform/pavement.py
Original file line number Diff line number Diff line change
Expand Up @@ -83,7 +83,7 @@ def setup_geoserver(options):
geoserver_dir.makedirs()

webapp_dir = geoserver_dir / 'geoserver'
if not webapp_dir:
if not webapp_dir.exists():
webapp_dir.makedirs()

print 'extracting geoserver'
Expand Down