# HG changeset patch
# User boris
# Date 1370460001 14400
# Node ID 7dffbe1a3880dcafa6ef3ca151b38764e692d117
# Parent  f403e282ba95b48744ce1ab16dc1c9b60a959c87
changed R dependency revision

diff -r f403e282ba95 -r 7dffbe1a3880 tool_dependencies.xml
--- a/tool_dependencies.xml	Wed Jun 05 14:21:33 2013 -0400
+++ b/tool_dependencies.xml	Wed Jun 05 15:20:01 2013 -0400
@@ -3,7 +3,7 @@
         <repository changeset_revision="7c94649a1f86" name="package_readline_6_2" owner="boris" prior_installation_required="True" toolshed="http://testtoolshed.g2.bx.psu.edu/"/>
     </package>
     <package name="R" version="2.15.0">
-        <repository changeset_revision="ff26ae313d4d" name="package_r_2_15" owner="boris" prior_installation_required="True" toolshed="http://testtoolshed.g2.bx.psu.edu/"/>
+        <repository changeset_revision="562ebf52a8fe" name="package_r_2_15" owner="boris" prior_installation_required="True" toolshed="http://testtoolshed.g2.bx.psu.edu/"/>
     </package>
     <package name="rpy2" version="2.2.6">
         <install version="1.0">
@@ -13,15 +13,17 @@
                     <repository changeset_revision="7c94649a1f86" name="package_readline_6_2" owner="boris" toolshed="http://testtoolshed.g2.bx.psu.edu/">
                         <package name="readline" version="6.2"/>
                     </repository>
-                    <repository changeset_revision="ff26ae313d4d" name="package_r_2_15" owner="boris" toolshed="http://testtoolshed.g2.bx.psu.edu/">
+                    <repository changeset_revision="562ebf52a8fe" name="package_r_2_15" owner="boris" toolshed="http://testtoolshed.g2.bx.psu.edu/">
                         <package name="R" version="2.15.0"/>
                     </repository>
                 </action>
                 <action type="make_directory">$INSTALL_DIR/lib/python</action>
                 <action type="shell_command">export PYTHONPATH=$PYTHONPATH:$INSTALL_DIR/lib/python &amp;&amp;
-                export R_HOME=$R_HOME &amp;&amp; export R_LIBS=$R_LIBS &amp;&amp;
+                export R_HOME=${R_HOME} &amp;&amp; export R_LIBS=${R_LIBS} &amp;&amp;
                 python setup.py install --home $INSTALL_DIR --install-scripts $INSTALL_DIR/bin</action>
                 <action type="set_environment">
+                    <environment_variable name="R_HOME" action="set_to">${R_HOME}</environment_variable>
+                    <environment_variable name="R_LIBS" action="set_to">${R_LIBS}</environment_variable>
                     <environment_variable name="PYTHONPATH" action="prepend_to">$INSTALL_DIR/lib/python</environment_variable>
                     <environment_variable name="PATH" action="prepend_to">$INSTALL_DIR/bin</environment_variable>
                 </action>