p36850791
/
kinetic-devel
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

adding proper catches in rosmake for undetected OSs #2308

This commit is contained in:
Tully Foote 2010-01-14 18:36:54 +00:00
parent 30d54f4406
commit d17273d23a
2 changed files with 14 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
tools/rosmake/src/rosmake/package_stats.py
View File

@ -46,9 +46,12 @@ class PackageFlagTracker:
blacklisted and all their dependents. """
def __init__(self, dependency_tracker, os_name = None, os_version = None):
if not os_name and not os_version:
osd = roslib.os_detect.OSDetect()
self.os_name = osd.get_name()
self.os_version = osd.get_version()
try:
osd = roslib.os_detect.OSDetect()
self.os_name = osd.get_name()
self.os_version = osd.get_version()
except roslib.os_detect.OSDetectException, ex:
print >> sys.stderr, "Could not detect OS. platform detection will not work"
else:
self.os_name = os_name
self.os_version = os_version

11
tools/rosmake/src/rosmake/rosmake.py
View File

@ -90,7 +90,10 @@ class RosMakeAll:
def check_rosdep(self, packages):
self.print_all("Checking rosdeps compliance for system dependencies %s. This may take a few seconds."%(', '.join(packages)))
r = rosdep.core.Rosdep(packages, robust=True)
try:
r = rosdep.core.Rosdep(packages, robust=True)
except roslib.os_detect.OSDetectException, ex:
return "%s"%ex
(output, scripts) = r.check()
if len(scripts) > 0:
self.print_all("Rosdep couldn't check scripts: %s"%scripts)
@ -103,7 +106,10 @@ class RosMakeAll:
def install_rosdeps(self, packages, default_yes):
self.print_all("Generating Install Script using rosdep then executing. This may take a minute, you will be prompted for permissions. . .")
r = rosdep.core.Rosdep(packages, robust=True)
try:
r = rosdep.core.Rosdep(packages, robust=True)
except roslib.os_detect.OSDetectException, ex:
return "%s"%ex
try:
r.install(include_duplicates=False, default_yes=default_yes);
self.print_all("Rosdep successfully installed all system dependencies")
@ -616,7 +622,6 @@ class RosMakeAll:
self.rosdep_install_result = self.install_rosdeps(buildable_packages, options.rosdep_yes)
elif not options.rosdep_disabled:
self.rosdep_check_result = self.check_rosdep(buildable_packages)
#generate the list of packages necessary to build(in order of dependencies)
counter = 0