Revision: 698
          http://rpy.svn.sourceforge.net/rpy/?rev=698&view=rev
Author:   lgautier
Date:     2008-11-20 20:31:49 +0000 (Thu, 20 Nov 2008)

Log Message:
-----------
Fixed error error message when R is not in the PATH (either at build time or at 
run time)

Modified Paths:
--------------
    rpy2/branches/version_2.0.x/rpy/rinterface/__init__.py
    rpy2/branches/version_2.0.x/setup.py

Modified: rpy2/branches/version_2.0.x/rpy/rinterface/__init__.py
===================================================================
--- rpy2/branches/version_2.0.x/rpy/rinterface/__init__.py      2008-11-19 
22:12:22 UTC (rev 697)
+++ rpy2/branches/version_2.0.x/rpy/rinterface/__init__.py      2008-11-20 
20:31:49 UTC (rev 698)
@@ -22,7 +22,7 @@
                     "This might be because R.exe is nowhere in your Path.")
     else:
         raise RuntimeError(
-            "R_HOME define, and no R command in the PATH."
+            "R_HOME not defined, and no R command in the PATH."
             )
 else:
 #Twist if 'R RHOME' spits out a warning

Modified: rpy2/branches/version_2.0.x/setup.py
===================================================================
--- rpy2/branches/version_2.0.x/setup.py        2008-11-19 22:12:22 UTC (rev 
697)
+++ rpy2/branches/version_2.0.x/setup.py        2008-11-20 20:31:49 UTC (rev 
698)
@@ -11,6 +11,11 @@
 if RHOMES is None:
     
     RHOMES = os.popen("R RHOME").readlines()
+    if len(RHOMES) == 0:
+        raise RuntimeError(
+            "R_HOME not defined, and no R command in the PATH."
+            )
+
     #Twist if 'R RHOME' spits out a warning
     if RHOMES[0].startswith("WARNING"):
         RHOMES = RHOMES[1]


This was sent by the SourceForge.net collaborative development platform, the 
world's largest Open Source development site.

-------------------------------------------------------------------------
This SF.Net email is sponsored by the Moblin Your Move Developer's challenge
Build the coolest Linux based applications with Moblin SDK & win great prizes
Grand prize is a trip for two to an Open Source event anywhere in the world
http://moblin-contest.org/redirect.php?banner_id=100&url=/
_______________________________________________
rpy-list mailing list
rpy-list@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/rpy-list

Reply via email to