From 5c06fd4488191539c79d2cc24d84e14fdab87afb Mon Sep 17 00:00:00 2001
From: Ken Conley <kwc@kwc.org>
Date: Wed, 21 Oct 2009 20:53:37 +0000
Subject: [PATCH] update_path->load_manifest

---
 core/roslib/src/roslib/launcher.py | 4 ++--
 test/rostest/nodes/hztest          | 2 +-
 test/test_rospy/test/talker        | 2 +-
 tools/rosdoc/rosdoc                | 2 +-
 tools/rostopic/bin/rostopic        | 2 +-
 5 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/core/roslib/src/roslib/launcher.py b/core/roslib/src/roslib/launcher.py
index b9ef8afa..0136e226 100644
--- a/core/roslib/src/roslib/launcher.py
+++ b/core/roslib/src/roslib/launcher.py
@@ -58,8 +58,8 @@ _bootstrapped = []
 
 def load_manifest(package_name, bootstrap_version="0.7"):
     """
-    Update the Python sys.path with package dependencies
-    @param package_name: name of the package that update_path is being called from.
+    Update the Python sys.path with package's dependencies
+    @param package_name: name of the package that load_manifest() is being called from.
     @type  package_name: str
     @param bootstrap_version: (keyword argument) do not use. Soon to be deprecated
     @type  bootstrap_version: str
diff --git a/test/rostest/nodes/hztest b/test/rostest/nodes/hztest
index 34e8d5a6..a6e79367 100755
--- a/test/rostest/nodes/hztest
+++ b/test/rostest/nodes/hztest
@@ -42,7 +42,7 @@
 ##  * ~/test_duration: time (in secs) to run test
 ## 
 
-import roslib; roslib.update_path('rostest')
+import roslib; roslib.load_manifest('rostest')
 
 import sys
 import threading
diff --git a/test/test_rospy/test/talker b/test/test_rospy/test/talker
index eb00bfef..1ac571ef 100755
--- a/test/test_rospy/test/talker
+++ b/test/test_rospy/test/talker
@@ -37,7 +37,7 @@
 
 PKG = 'test_rospy'
 NAME = 'talker'
-import roslib; roslib.update_path(PKG)
+import roslib; roslib.load_manifest(PKG)
 
 import sys
 import rospy
diff --git a/tools/rosdoc/rosdoc b/tools/rosdoc/rosdoc
index f22be7e9..724e93fc 100755
--- a/tools/rosdoc/rosdoc
+++ b/tools/rosdoc/rosdoc
@@ -33,6 +33,6 @@
 #
 # Revision $Id$
 
-import roslib; roslib.update_path('rosdoc')
+import roslib; roslib.load_manifest('rosdoc')
 import rosdoc
 rosdoc.main()
diff --git a/tools/rostopic/bin/rostopic b/tools/rostopic/bin/rostopic
index 98668efc..146e0eb1 100755
--- a/tools/rostopic/bin/rostopic
+++ b/tools/rostopic/bin/rostopic
@@ -1,4 +1,4 @@
 #!/usr/bin/env python
-import roslib; roslib.update_path('rostopic')
+import roslib; roslib.load_manifest('rostopic')
 import rostopic
 rostopic.rostopicmain()