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

fixing error message in exception and adding exception on malformed os detect class not from OSBase. similar to work for #2358

This commit is contained in:
Tully Foote 2010-02-12 02:43:08 +00:00
parent 7148bf0328
commit a519acdfb1
1 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
core/roslib/src/roslib/os_detect.py
View File

@ -92,10 +92,10 @@ class OSBase:
raise OSDetectException("check_presence unimplemented")
def get_name(self):
raise OSDetectException("check_presence unimplemented")
raise OSDetectException("get_name unimplemented")
def get_version(self):
raise OSDetectException("check_presence unimplemented")
raise OSDetectException("get_version unimplemented")
###### Debian SPECIALIZATION #########################
class Debian(OSBase):
@ -374,6 +374,9 @@ class OSDetect:
def __init__(self, os_list = [Debian(), Ubuntu(), Mint(), Macports(), Arch(), Fedora(), Rhel(), Gentoo(), Cygwin()]):
self._os_list = [ Override()]
self._os_list.extend(os_list)
for o in self._os_list:
if not isinstance(o, OSBase):
raise OSDetectException("Class [%s] not derived from OSBase"%o.__class__.__name__)
self._os_class = None
self._os_name = None