addressed rospy import issue & noformat

mjyc · Nov 1, 2014 · 782dbe1 · mjyc · Nov 1, 2014 · 782dbe1
1 parent 1fe850b
commit 782dbe1
Showing 1 changed file with 5 additions and 2 deletions.
diff --git a/tools/rosgraph/src/rosgraph/roslogging.py b/tools/rosgraph/src/rosgraph/roslogging.py
@@ -162,8 +162,11 @@ def emit(self, record):
             msg = msg.replace('${file}', str(record.pathname))
             msg = msg.replace('${line}', str(record.lineno))
             msg = msg.replace('${function}', str(record.funcName))
-            from rospy import get_name
-            msg = msg.replace('${node}', get_name())
+            try:
+                from rospy import get_name
+                msg = msg.replace('${node}', get_name())
+            except ImportError:
+                msg = msg.replace('${node}', 'unavailable')
             if self._get_time is not None and not self._is_wallclock():
                 msg += ' [%f]' % self._get_time()
             msg += '\n'