From 7596de59030b1e03aa4f6f5027c6e0a360d4553d Mon Sep 17 00:00:00 2001
From: Bob Lantz <rlantz@cs.stanford.edu>
Date: Wed, 29 Jun 2011 19:25:28 -0700
Subject: [PATCH] Upgrade networkx on Ubuntu 10.04 LTS to avoid deprecation
 warning.

---
 util/install.sh | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/util/install.sh b/util/install.sh
index 6dcd0c0..7eedd09 100755
--- a/util/install.sh
+++ b/util/install.sh
@@ -84,6 +84,11 @@ function mn_deps {
 	sudo aptitude install -y gcc make screen psmisc xterm ssh iperf iproute \
         python-setuptools python-networkx
 
+    if [ "$DIST" = "Ubuntu" ] && grep '10.04' /etc/*release*; then
+        echo "Upgrading networkx to avoid deprecation warning"
+        sudo easy_install --upgrade networkx
+    fi
+
 	#Add sysctl parameters as noted in the INSTALL file to increase kernel limits to support larger setups:
 	sudo su -c "cat $HOME/mininet/util/sysctl_addon >> /etc/sysctl.conf"