[cig-commits] r16055 - cs/portal/trunk/northridge/SeismoWebPortal

[luis at geodynamics.org]

Author: luis
Date: 2009-11-30 00:51:56 -0800 (Mon, 30 Nov 2009)
New Revision: 16055

Modified:
   cs/portal/trunk/northridge/SeismoWebPortal/gmt.py
Log:
Default to /usr/bin/convert when WEBPORTAL_IMAGEMAGICK_ROOT is not defined.


Modified: cs/portal/trunk/northridge/SeismoWebPortal/gmt.py
===================================================================
--- cs/portal/trunk/northridge/SeismoWebPortal/gmt.py	2009-11-30 08:27:28 UTC (rev 16054)
+++ cs/portal/trunk/northridge/SeismoWebPortal/gmt.py	2009-11-30 08:51:56 UTC (rev 16055)
@@ -13,7 +13,7 @@
 
 GMT_ROOT = os.path.join(settings.MEDIA_ROOT, 'SeismoWebPortal', 'gmt')
 gmt_bin = join(os.environ['WEBPORTAL_GMT_ROOT'], "bin")
-imagemagick_bin = join(os.environ['WEBPORTAL_IMAGEMAGICK_ROOT'], "bin")
+imagemagick_bin = join(os.environ.get('WEBPORTAL_IMAGEMAGICK_ROOT', "/usr"), "bin")
 netCDF_lib = join(os.environ['WEBPORTAL_NETCDF_ROOT'], "lib")