From: Claudio-Daniel Freire <claudio-daniel.freire@inria.fr>
Date: Tue, 9 Aug 2011 15:32:24 +0000 (+0200)
Subject: YumDependency fix: try tar twice, yum seems to be working in the background at times
X-Git-Tag: nepi-3.0.0~318
X-Git-Url: http://git.onelab.eu/?a=commitdiff_plain;h=7e1d0bf9863c1d2731d2781e1adcc8f72857337f;p=nepi.git

YumDependency fix: try tar twice, yum seems to be working in the background at times
---

diff --git a/src/nepi/testbeds/planetlab/application.py b/src/nepi/testbeds/planetlab/application.py
index d2980667..433f91c7 100644
--- a/src/nepi/testbeds/planetlab/application.py
+++ b/src/nepi/testbeds/planetlab/application.py
@@ -955,11 +955,14 @@ class YumDependency(Dependency):
         
         # download rpms and pack into a tar archive
         return (
+            "sudo -S yum -y makecache && "
             "sudo -S sed -i -r 's/keepcache *= *0/keepcache=1/' /etc/yum.conf && "
             " ( ( "
                 "sudo -S yum -y install %s ; "
                 "rm -f ${BUILD}/packages.tar ; "
-                "tar -C /var/cache/yum -rf ${BUILD}/packages.tar $(find /var/cache/yum -iname '*.rpm')"
+                "( tar -C /var/cache/yum -rf ${BUILD}/packages.tar $(find /var/cache/yum -iname '*.rpm')"
+                    # Try again if it fails, some files sometimes disappear because yum deletes them
+                "  || ( rm -f ${BUILD}/packages.tar ; tar -C /var/cache/yum -rf ${BUILD}/packages.tar $(find /var/cache/yum -iname '*.rpm') ) )"
             " ) || /bin/true ) && "
             "sudo -S sed -i -r 's/keepcache *= *1/keepcache=0/' /etc/yum.conf && "
             "sudo -S yum -y clean packages "