Author: wim
Date: 2012-03-30 15:51:13 -0700 (Fri, 30 Mar 2012)
New Revision: 16597

Modified:
   stacks/ros_release/branches/fuerte/job_generation/scripts/generate_rosinstall.py
Log:
port to new rospkg

Modified: stacks/ros_release/branches/fuerte/job_generation/scripts/generate_rosinstall.py
===================================================================
--- stacks/ros_release/branches/fuerte/job_generation/scripts/generate_rosinstall.py	2012-03-30 22:37:54 UTC (rev 16596)
+++ stacks/ros_release/branches/fuerte/job_generation/scripts/generate_rosinstall.py	2012-03-30 22:51:13 UTC (rev 16597)
@@ -4,7 +4,7 @@
 
 import sys
 import subprocess
-import rosdistro 
+import rospkg.distro 
 import optparse
 import datetime
 from job_generation.jobs_common import *
@@ -16,13 +16,13 @@
         return -1
 
     # Parse distro file
-    distro_obj = rosdistro.Distro(get_rosdistro_file(options.rosdistro))
+    distro_obj = rospkg.distro.load_distro(rospkg.distro.distro_uri(options.rosdistro))
 
     # generate rosinstall file for variant
     if options.overlay == 'yes':
-        rosinstall = rosdistro.variant_to_rosinstall(options.variant, distro_obj, 'release-tar')
+        rosinstall = rospkg.distro.distro_to_rosinstall(distro_obj, 'release-tar', options.variant, False)
     else:
-        rosinstall = rosdistro.extended_variant_to_rosinstall(options.variant, distro_obj, 'release-tar')        
+        rosinstall = rospkg.distro.distro_to_rosinstall(distro_obj, 'release-tar', options.variant, True)
 
     print rosinstall
 

_______________________________________________
Ros-commits mailing list
Ros-commits@code.ros.org
https://code.ros.org/mailman/listinfo/ros-commits