[tuxdroid-svn] r5583 - in software_suite_v3/smart-core/smart-server/branches/user_mode: . util/applicationserver/plugin/interpreters

[ks156 <c2m...@c2...>]

Author: ks156
Date: 2009-10-01 15:26:08 +0200 (Thu, 01 Oct 2009)
New Revision: 5583

Modified:
   software_suite_v3/smart-core/smart-server/branches/user_mode/installer.nsi
   software_suite_v3/smart-core/smart-server/branches/user_mode/util/applicationserver/plugin/interpreters/PluginInterpreter.py
   software_suite_v3/smart-core/smart-server/branches/user_mode/version.py
Log:
* Merged r5520 through r5582 from trunk into user_mode


Modified: software_suite_v3/smart-core/smart-server/branches/user_mode/installer.nsi
===================================================================
--- software_suite_v3/smart-core/smart-server/branches/user_mode/installer.nsi	2009-10-01 13:18:53 UTC (rev 5582)
+++ software_suite_v3/smart-core/smart-server/branches/user_mode/installer.nsi	2009-10-01 13:26:08 UTC (rev 5583)
@@ -4,7 +4,7 @@
 
 ; HM NIS Edit Wizard helper defines
 !define PRODUCT_NAME "Smart Server"
-!define PRODUCT_VERSION "0.4.2-b3"
+!define PRODUCT_VERSION "0.4.3-b0"
 
 ; Output names
 !define FINAL_INSTALLER_EXE "SmartServerInstaller_${PRODUCT_VERSION}.exe"

Modified: software_suite_v3/smart-core/smart-server/branches/user_mode/util/applicationserver/plugin/interpreters/PluginInterpreter.py
===================================================================
--- software_suite_v3/smart-core/smart-server/branches/user_mode/util/applicationserver/plugin/interpreters/PluginInterpreter.py	2009-10-01 13:18:53 UTC (rev 5582)
+++ software_suite_v3/smart-core/smart-server/branches/user_mode/util/applicationserver/plugin/interpreters/PluginInterpreter.py	2009-10-01 13:26:08 UTC (rev 5583)
@@ -295,11 +295,12 @@
             self.__onPluginStartedCallback()
         while self.__getRun():
             line = self.__process.stdout.readline()
-            try:
-                tmp = line.decode("latin-1", "ignore")
-                line = tmp.encode("utf-8", "ignore")
-            except:
-                pass
+            if os.name == 'nt':
+                try:
+                    tmp = line.decode("latin-1", "ignore")
+                    line = tmp.encode("utf-8", "ignore")
+                except:
+                    pass
             if len(line) == 0:
                 self.__setRun(False)
                 if self.__onPluginStoppedCallback != None:

Modified: software_suite_v3/smart-core/smart-server/branches/user_mode/version.py
===================================================================
--- software_suite_v3/smart-core/smart-server/branches/user_mode/version.py	2009-10-01 13:18:53 UTC (rev 5582)
+++ software_suite_v3/smart-core/smart-server/branches/user_mode/version.py	2009-10-01 13:26:08 UTC (rev 5583)
@@ -7,7 +7,7 @@
 #    Distributed under the terms of the GNU General Public License
 #    http://www.gnu.org/copyleft/gpl.html
 
-version = '0.4.2-b3'
+version = '0.4.3-b0'
 author = "Remi Jocaille (rem...@c2...)"
 licence = "GPL"
 date = "2009"