[openrtm-commit:01763] r663 - in branches/RELENG_1_1/OpenRTM-aist-Python: . OpenRTM_aist/utils/rtm-naming

[openrtm ＠ openrtm.org]

Author: kawauchi
Date: 2016-02-26 16:29:23 +0900 (Fri, 26 Feb 2016)
New Revision: 663

Modified:
   branches/RELENG_1_1/OpenRTM-aist-Python/
   branches/RELENG_1_1/OpenRTM-aist-Python/OpenRTM_aist/utils/rtm-naming/rtm-naming.py
Log:
[compat,->RELENG_1_1] rtm-naming has been supported omniORB4.2. refs #3461


Property changes on: branches/RELENG_1_1/OpenRTM-aist-Python
___________________________________________________________________
Modified: svn:mergeinfo
   - /branches/RELENG_1_0/OpenRTM-aist-Python:345-404
/branches/RELENG_1_1/OpenRTM-aist-Python:396-478,488-497
/branches/work/OpenRTM-aist-Python:504-542
   + /branches/RELENG_1_0/OpenRTM-aist-Python:345-404
/branches/RELENG_1_1/OpenRTM-aist-Python:396-478,488-497
/branches/work/OpenRTM-aist-Python:504-542
/trunk/OpenRTM-aist-Python:662

Modified: branches/RELENG_1_1/OpenRTM-aist-Python/OpenRTM_aist/utils/rtm-naming/rtm-naming.py
===================================================================
--- branches/RELENG_1_1/OpenRTM-aist-Python/OpenRTM_aist/utils/rtm-naming/rtm-naming.py	2016-02-26 07:20:41 UTC (rev 662)
+++ branches/RELENG_1_1/OpenRTM-aist-Python/OpenRTM_aist/utils/rtm-naming/rtm-naming.py	2016-02-26 07:29:23 UTC (rev 663)
@@ -91,6 +91,12 @@
     if os.path.exists(bak_file):
         del_file(bak_file)
 
+    dat_fname = "omninames-" + hostname + ".dat"
+    dat_file = os.path.join(log_path, dat_fname)
+
+    if os.path.exists(dat_file):
+        del_file(dat_file)
+
     if port == "":
         port = default_port