Revision: 494
http://rpy.svn.sourceforge.net/rpy/?rev=494&view=rev
Author: lgautier
Date: 2008-04-17 13:44:44 -0700 (Thu, 17 Apr 2008)
Log Message:
-----------
- Fixes
Modified Paths:
--------------
branches/rpy_nextgen/setup.py
Modified: branches/rpy_nextgen/setup.py
===================================================================
--- branches/rpy_nextgen/setup.py 2008-04-17 19:16:29 UTC (rev 493)
+++ branches/rpy_nextgen/setup.py 2008-04-17 20:44:44 UTC (rev 494)
@@ -29,6 +29,9 @@
r_exec = os.path.join(RHOME, 'bin', 'R')
rp = os.popen(r_exec+' --version')
rversion = rp.readline()
+ #Twist if 'R RHOME' spits out a warning
+ if rversion.startswith("WARNING"):
+ rversion = rp.readline()
m = re.match('^R version ([^ ]+) .+$', rversion)
rversion = m.groups()[0]
rversion = [int(x) for x in rversion.split('.')]
@@ -48,7 +51,6 @@
rversions = []
for RHOME in RHOMES:
RHOME = RHOME.strip()
- print('R\'s home is:%s' %RHOME)
rversion = get_rversion(RHOME)
if (cmp_version(rversion, rnewest) == +1):
rnewest = rversion
@@ -91,7 +93,7 @@
for rversion, RHOME in itertools.izip(rversions, RHOMES):
-
+ RHOME = RHOME.strip()
if (cmp_version(rversion, rnewest) == 0):
r_packversion = None
doSetup(RHOME, r_packversion)
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 2008 JavaOne(SM) Conference
Don't miss this year's exciting event. There's still time to save $100.
Use priority code J8TL2D2.
http://ad.doubleclick.net/clk;198757673;13503038;p?http://java.sun.com/javaone
_______________________________________________
rpy-list mailing list
rpy-list@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/rpy-list
