[openrtm-commit:00935] r545 - trunk/OpenRTM-aist-Python/OpenRTM_aist

[openrtm ＠ openrtm.org]

Author: kurihara
Date: 2013-01-08 23:19:01 +0900 (Tue, 08 Jan 2013)
New Revision: 545

Modified:
   trunk/OpenRTM-aist-Python/OpenRTM_aist/Manager.py
Log:
The bug of configureComponent() has been fixed. refs #2558.

Modified: trunk/OpenRTM-aist-Python/OpenRTM_aist/Manager.py
===================================================================
--- trunk/OpenRTM-aist-Python/OpenRTM_aist/Manager.py	2012-05-16 06:38:06 UTC (rev 544)
+++ trunk/OpenRTM-aist-Python/OpenRTM_aist/Manager.py	2013-01-08 14:19:01 UTC (rev 545)
@@ -2120,7 +2120,7 @@
     if self._config.findNode(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"):
+      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"):
@@ -2142,7 +2142,7 @@
     if self._config.findNode(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"):
+      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"):