Revision: 776
http://rpy.svn.sourceforge.net/rpy/?rev=776&view=rev
Author: warnes
Date: 2010-02-11 20:53:49 +0000 (Thu, 11 Feb 2010)
Log Message:
-----------
Modify version regexp to allow multi-digit numbers in any section.
Modified Paths:
--------------
trunk/rpy/rpy_tools.py
Modified: trunk/rpy/rpy_tools.py
===================================================================
--- trunk/rpy/rpy_tools.py 2010-02-06 18:27:21 UTC (rev 775)
+++ trunk/rpy/rpy_tools.py 2010-02-11 20:53:49 UTC (rev 776)
@@ -97,9 +97,7 @@
if stat or len(output)<=0:
raise RuntimeError("Couldn't execute the R interpreter" +
" `%s'.\n" % rexec )
- # edd 05 Apr 2006 version = re.search("R +([0-9]\.[0-9]\.[0-9])", output)
- # edd 16 Oct 2009 version = re.search("R +([0-9]\.[0-9]+\.[0-9])", output)
- version = re.search(" +([0-9]\.[0-9]+\.[0-9])", output)
+ version = re.search(" +([0-9]+\.[0-9]+\.[0-9]+)", output)
if not version:
raise RuntimeError("Couldn't obtain version number from output\n"
"of `R --version'.\n")
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
------------------------------------------------------------------------------
SOLARIS 10 is the OS for Data Centers - provides features such as DTrace,
Predictive Self Healing and Award Winning ZFS. Get Solaris 10 NOW
http://p.sf.net/sfu/solaris-dev2dev
_______________________________________________
rpy-list mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/rpy-list