From: Claudio-Daniel Freire <claudio-daniel.freire@inria.fr>
Date: Mon, 18 Jul 2011 14:18:54 +0000 (+0200)
Subject: Fix ns3-3.9 URL
X-Git-Tag: nepi-3.0.0~372
X-Git-Url: http://git.onelab.eu/?a=commitdiff_plain;h=87177eecd189b755e42617324472925a2d92031e;p=nepi.git

Fix ns3-3.9 URL
Fix installation to not break everything when ${BUILD}/target does not exist (or is empty)
---

diff --git a/src/nepi/testbeds/planetlab/application.py b/src/nepi/testbeds/planetlab/application.py
index 24305cef..3d72bde1 100644
--- a/src/nepi/testbeds/planetlab/application.py
+++ b/src/nepi/testbeds/planetlab/application.py
@@ -793,7 +793,7 @@ class NS3Dependency(Dependency):
         # We have to download the sources, untar, build...
         pybindgen_source_url = "http://pybindgen.googlecode.com/files/pybindgen-0.15.0.zip"
         pygccxml_source_url = "http://leaseweb.dl.sourceforge.net/project/pygccxml/pygccxml/pygccxml-1.0/pygccxml-1.0.0.zip"
-        ns3_source_url = "http://yans.pl.sophia.inria.fr/code/hgwebdir.cgi/nepi-ns-3.9/archive/tip.tar.gz"
+        ns3_source_url = "http://yans.pl.sophia.inria.fr/code/hgwebdir.cgi/ns-3.9-nepi/archive/tip.tar.gz"
         passfd_source_url = "http://yans.pl.sophia.inria.fr/code/hgwebdir.cgi/python-passfd/archive/tip.tar.gz"
         self.build =(
             " ( "
@@ -854,6 +854,8 @@ class NS3Dependency(Dependency):
             "  test -f lib/libns3.so "
             " ) || ( "
                 # Not working, reinstall
+                    "test -d ${BUILD}/target && "
+                    "[[ \"x\" != \"x$(find ${BUILD}/target -mindepth 1 -print -quit)\" ]] &&"
                     "( for i in ${BUILD}/target/* ; do rm -rf ${SOURCES}/${i##*/} ; done ) && " # mv doesn't like unclean targets
                     "mv -f ${BUILD}/target/* ${SOURCES}"
             " )"