[GNUnet-SVN] r22962 - gnunet-planetlab/gplmt/contrib

[gnunet]

Author: wachs
Date: 2012-07-30 09:56:01 +0200 (Mon, 30 Jul 2012)
New Revision: 22962

Modified:
   gnunet-planetlab/gplmt/contrib/deploy_gnunet_fc8.xml
Log:
working tasklist: outdated libgcrypt can be removed without breaking system 
tools

Modified: gnunet-planetlab/gplmt/contrib/deploy_gnunet_fc8.xml
===================================================================
--- gnunet-planetlab/gplmt/contrib/deploy_gnunet_fc8.xml        2012-07-30 
07:40:40 UTC (rev 22961)
+++ gnunet-planetlab/gplmt/contrib/deploy_gnunet_fc8.xml        2012-07-30 
07:56:01 UTC (rev 22962)
@@ -201,7 +201,7 @@
       <run id="1" name="Download glpk">
             <command>mkdir glpk; cd glpk; wget </command> 
             
<arguments>http://ftp.gnu.org/gnu/glpk/glpk-4.47.tar.gz</arguments> 
-            <timeout>120</timeout> 
+            <timeout>0</timeout> 
             <expected_return_code>0</expected_return_code>
             <expected_output></expected_output>
             <stop_on_fail>true</stop_on_fail>
@@ -209,7 +209,7 @@
       <run id="1" name="Unpack glpk">
             <command>cd glpk; tar -xzvf</command> 
             <arguments>glpk-4.47.tar.gz</arguments> 
-            <timeout>120</timeout> 
+            <timeout>0</timeout> 
             <expected_return_code>0</expected_return_code>
             <expected_output></expected_output>
             <stop_on_fail>true</stop_on_fail>
@@ -217,7 +217,7 @@
       <run id="1" name="Configure glpk">
             <command>cd glpk/glpk-4.47; ./configure </command> 
             <arguments> --with-gnutls</arguments> 
-            <timeout>120</timeout> 
+            <timeout>0</timeout> 
             <expected_return_code>0</expected_return_code>
             <expected_output></expected_output>
             <stop_on_fail>true</stop_on_fail>
@@ -225,7 +225,7 @@
       <run id="1" name="Install glpk">
             <command>cd glpk/glpk-4.47; sudo make install</command>
             <arguments> </arguments> 
-            <timeout>480</timeout> 
+            <timeout>0</timeout> 
             <expected_return_code>0</expected_return_code>
             <expected_output></expected_output>
             <stop_on_fail>true</stop_on_fail>
@@ -372,6 +372,16 @@
       </run>
     </sequence>
     
+    <sequence>
+               <run id="1" name="Remove conflicting packages : libgcrypt">
+          <command>sudo rpm -e --nodeps</command> 
+          <arguments>libgcrypt</arguments> 
+          <timeout>0</timeout> 
+          <expected_return_code>0</expected_return_code>
+          <expected_output></expected_output>
+          <stop_on_fail>false</stop_on_fail>
+       </run>  
+       </sequence>
 
         <sequence enabled="true">
      <!-- Install libextractor -->