Revision: 462
          http://rpy.svn.sourceforge.net/rpy/?rev=462&view=rev
Author:   lgautier
Date:     2008-03-23 15:03:51 -0700 (Sun, 23 Mar 2008)

Log Message:
-----------
R_HOME trouble at compile time was not properly fixed :/

Modified Paths:
--------------
    branches/rpy_nextgen/setup.py

Modified: branches/rpy_nextgen/setup.py
===================================================================
--- branches/rpy_nextgen/setup.py       2008-03-23 11:20:29 UTC (rev 461)
+++ branches/rpy_nextgen/setup.py       2008-03-23 22:03:51 UTC (rev 462)
@@ -9,11 +9,12 @@
 RHOMES = os.getenv('RHOMES')
 
 if RHOMES is None:
-    RHOMES = [Popen(["R", "RHOME"], stdout=PIPE).communicate()[0].strip(), ]
+    RHOMES = Popen(["R", "RHOME"], stdout=PIPE).communicate()[0].strip()
     #Twist if 'R RHOME' spits out a warning
-    if RHOMES[:6] == "WARNING":
-        i = s.find(os.linesep)
+    if RHOMES.startswith("WARNING"):
+        i = RHOMES.find(os.linesep)
         RHOMES = RHOMES[i:]
+    RHOMES = [RHOMES, ]
 else:
     RHOMES = RHOMES.split(os.pathsep)
 


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: Microsoft
Defy all challenges. Microsoft(R) Visual Studio 2008.
http://clk.atdmt.com/MRT/go/vse0120000070mrt/direct/01/
_______________________________________________
rpy-list mailing list
rpy-list@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/rpy-list

Reply via email to