[openrtm-commit:01060] r561 - in branches/RELENG_1_1/OpenRTM-aist-Python: . OpenRTM_aist

[openrtm ＠ openrtm.org]

Author: n-ando
Date: 2013-04-27 01:21:29 +0900 (Sat, 27 Apr 2013)
New Revision: 561

Modified:
   branches/RELENG_1_1/OpenRTM-aist-Python/
   branches/RELENG_1_1/OpenRTM-aist-Python/OpenRTM_aist/Manager.py
Log:
merged r543-547 from trunk.


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
/trunk/OpenRTM-aist-Python:498-500,502,511,543-544
   + /branches/RELENG_1_0/OpenRTM-aist-Python:345-404
/branches/RELENG_1_1/OpenRTM-aist-Python:396-478
/trunk/OpenRTM-aist-Python:498-500,502,511,543-547

Modified: branches/RELENG_1_1/OpenRTM-aist-Python/OpenRTM_aist/Manager.py
===================================================================
--- branches/RELENG_1_1/OpenRTM-aist-Python/OpenRTM_aist/Manager.py	2013-04-26 16:09:39 UTC (rev 560)
+++ branches/RELENG_1_1/OpenRTM-aist-Python/OpenRTM_aist/Manager.py	2013-04-26 16:21:29 UTC (rev 561)
@@ -1978,7 +1978,13 @@
         name_prop.load(conff)
 
     if self._config.findNode(category + "." + inst_name):
-      name_prop.mergeProperties(self._config.getNode(category + "." + inst_name))
+      temp_ = OpenRTM_aist.Properties(prop=self._config.getNode(category+"."+inst_name))
+      keys_ = temp_.propertyNames()
+      if not (len(keys_) == 1 and keys_[-1] == "config_file"):
+        name_prop.mergeProperties(self._config.getNode(category + "." + inst_name))
+        self._rtcout.RTC_INFO("Component name conf exists in rtc.conf. Merged.")
+        if self._config.findNode("config_file"):
+          config_fname.append(self._config.getProperty("config_file"))
 
     if self._config.getProperty(type_conf) != "":
       try:
@@ -1990,7 +1996,13 @@
         type_prop.load(conff)
 
     if self._config.findNode(category + "." + type_name):
-      type_prop.mergeProperties(self._config.getNode(category + "." + type_name))
+      temp_ = OpenRTM_aist.Properties(prop=self._config.getNode(category+"."+type_name))
+      keys_ = temp_.propertyNames()
+      if not (len(keys_) == 1 and keys_[-1] == "config_file"):
+        type_prop.mergeProperties(self._config.getNode(category + "." + type_name))
+        self._rtcout.RTC_INFO("Component type conf exists in rtc.conf. Merged.")
+        if self._config.findNode("config_file"):
+          config_fname.append(self._config.getProperty("config_file"))
 
     comp.setProperties(prop)
     type_prop.mergeProperties(name_prop)