[Python-modules-commits] r18614 - in packages/basemap/trunk/debian/patches (use_share_datafiles)

[morph at users.alioth.debian.org]

    Date: Sunday, September 18, 2011 @ 22:12:06
  Author: morph
Revision: 18614

still allow to use BASEMAPDATA, while setting the default to the shared dir

Modified:
  packages/basemap/trunk/debian/patches/use_share_datafiles

Modified: packages/basemap/trunk/debian/patches/use_share_datafiles
===================================================================
--- packages/basemap/trunk/debian/patches/use_share_datafiles	2011-09-18 20:32:45 UTC (rev 18613)
+++ packages/basemap/trunk/debian/patches/use_share_datafiles	2011-09-18 22:12:06 UTC (rev 18614)
@@ -1,28 +1,16 @@
-Description: Use the datafile in the python-mpltoolkits.basemap-data package
+Description: Use the datafile in the python-mpltoolkits.basemap-data package,
+ if BASEMAPDATA is not set
 Author: Sandro Tosi <morph at debian.org>
 Index: basemap-1.0.1/lib/mpl_toolkits/basemap/__init__.py
 ===================================================================
---- basemap-1.0.1.orig/lib/mpl_toolkits/basemap/__init__.py	2011-09-18 21:11:30.058392111 +0200
-+++ basemap-1.0.1/lib/mpl_toolkits/basemap/__init__.py	2011-09-18 21:12:12.867833384 +0200
-@@ -47,12 +47,15 @@
- # basemap data files now installed in lib/matplotlib/toolkits/basemap/data
- # check to see if environment variable BASEMAPDATA set to a directory,
- # and if so look for the data there.
--if 'BASEMAPDATA' in os.environ:
--    basemap_datadir = os.environ['BASEMAPDATA']
--    if not os.path.isdir(basemap_datadir):
--        raise RuntimeError('Path in environment BASEMAPDATA not a directory')
--else:
+--- basemap-1.0.1.orig/lib/mpl_toolkits/basemap/__init__.py	2011-02-09 20:53:32.000000000 +0100
++++ basemap-1.0.1/lib/mpl_toolkits/basemap/__init__.py	2011-09-19 00:11:05.648202868 +0200
+@@ -52,7 +52,7 @@
+     if not os.path.isdir(basemap_datadir):
+         raise RuntimeError('Path in environment BASEMAPDATA not a directory')
+ else:
 -    basemap_datadir = os.sep.join([os.path.dirname(__file__), 'data'])
-+#if 'BASEMAPDATA' in os.environ:
-+#    basemap_datadir = os.environ['BASEMAPDATA']
-+#    if not os.path.isdir(basemap_datadir):
-+#        raise RuntimeError('Path in environment BASEMAPDATA not a directory')
-+#else:
-+#    basemap_datadir = os.sep.join([os.path.dirname(__file__), 'data'])
-+
-+# On Debian, we have a shared location for datafiles
-+basemap_datadir = '/usr/share/basemap/data'
++    basemap_datadir = '/usr/share/basemap/data'
  
  __version__ = '1.0.1'