Merge pull request jsk-ros-pkg#76 from garaemon/move-base-db-support-…

…hydro move_base_db.py support hydro
aginika · Sep 21, 2014 · 2ef7ca8 · 2ef7ca8
2 parents b3880e4 + 3b78320
commit 2ef7ca8
Showing 1 changed file with 5 additions and 2 deletions.
diff --git a/jsk_pr2_startup/jsk_pr2_lifelog/move_base_db.py b/jsk_pr2_startup/jsk_pr2_lifelog/move_base_db.py
@@ -32,10 +32,13 @@
 # cur.close()
 # con.commit()
 
-import roslib; roslib.load_manifest('jsk_pr2_startup')
 import rospy
 import pgdb
-import tf2_ros, tf2
+import tf2_ros
+try:
+    import tf2                  # groovy
+except:
+    import tf2_py as tf2
 import geometry_msgs
 
 class MoveBaseDB: