From 87177eecd189b755e42617324472925a2d92031e Mon Sep 17 00:00:00 2001 From: Claudio-Daniel Freire Date: Mon, 18 Jul 2011 16:18:54 +0200 Subject: [PATCH] Fix ns3-3.9 URL Fix installation to not break everything when ${BUILD}/target does not exist (or is empty) --- src/nepi/testbeds/planetlab/application.py | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) 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}" " )" -- 2.47.0