# HG changeset patch
# User Frederic Bastien <bastienf@iro.umontreal.ca>
# Date 1234549346 18000
# Node ID 14d22ca1c8b570949a1825136592af73f53fa2a6
# Parent  2704c8688ced55212a044e1c90a0feef951568f3
if PYLEARN_DATA_ROOT don't exist try DBPATH.

diff -r 2704c8688ced -r 14d22ca1c8b5 pylearn/datasets/config.py
--- a/pylearn/datasets/config.py	Wed Feb 11 01:43:14 2009 -0500
+++ b/pylearn/datasets/config.py	Fri Feb 13 13:22:26 2009 -0500
@@ -5,12 +5,14 @@
 """
 
 import os, sys
-def env_get(key, default):
+def env_get(key, default, key2 = None):
+    if key2 and os.getenv(key) is None:
+        key=key2
     if os.getenv(key) is None:
         print >> sys.stderr, "WARNING: Environment variable", key,
         print >> sys.stderr, "is not set. Using default of", default
     return default if os.getenv(key) is None else os.getenv(key)
 
 def data_root():
-    return env_get('PYLEARN_DATA_ROOT', os.getenv('HOME')+'/data')
+    return env_get('PYLEARN_DATA_ROOT', os.getenv('HOME')+'/data', 'DBPATH')