[Ecell-cvs] SF.net SVN: ecell:[3275] ecell3/branches/ecell-3.1/ecell/pyecell

[<mor...@us...>]

Revision: 3275
          http://ecell.svn.sourceforge.net/ecell/?rev=3275&view=rev
Author:   moriyoshi
Date:     2008-11-06 09:01:56 +0000 (Thu, 06 Nov 2008)

Log Message:
-----------
* Minor fixes for compatibility problems

Modified Paths:
--------------
    ecell3/branches/ecell-3.1/ecell/pyecell/ecell/SessionManager/Globus4Proxy.py
    ecell3/branches/ecell-3.1/ecell/pyecell/ecell/SessionManager/LocalProxy.py
    ecell3/branches/ecell-3.1/ecell/pyecell/ecell/SessionManager/SessionManager.py
    ecell3/branches/ecell-3.1/ecell/pyecell/ecell3-session-manager.in
    ecell3/branches/ecell-3.1/ecell/pyecell/ecell3-session.in

Modified: ecell3/branches/ecell-3.1/ecell/pyecell/ecell/SessionManager/Globus4Proxy.py
===================================================================
--- ecell3/branches/ecell-3.1/ecell/pyecell/ecell/SessionManager/Globus4Proxy.py	2008-11-06 01:35:42 UTC (rev 3274)
+++ ecell3/branches/ecell-3.1/ecell/pyecell/ecell/SessionManager/Globus4Proxy.py	2008-11-06 09:01:56 UTC (rev 3275)
@@ -571,7 +571,7 @@
         job.directory = absJobDirectory
         job.environment.update( self.getEnvironmentVariables() )
         job.executable = self.getInterpreter()
-        job.arguments = ( self.getScriptFileName(), )
+        job.arguments = self.getScriptFileArguments() + self.getArguments()
 
         tmpfile = None
         tmpfile = mkstemp()

Modified: ecell3/branches/ecell-3.1/ecell/pyecell/ecell/SessionManager/LocalProxy.py
===================================================================
--- ecell3/branches/ecell-3.1/ecell/pyecell/ecell/SessionManager/LocalProxy.py	2008-11-06 01:35:42 UTC (rev 3274)
+++ ecell3/branches/ecell-3.1/ecell/pyecell/ecell/SessionManager/LocalProxy.py	2008-11-06 09:01:56 UTC (rev 3275)
@@ -33,6 +33,7 @@
 import signal
 import sys
 import time
+from ecell.SessionManager.Constants import *
 
 try:
 #    raise Exception

Modified: ecell3/branches/ecell-3.1/ecell/pyecell/ecell/SessionManager/SessionManager.py
===================================================================
--- ecell3/branches/ecell-3.1/ecell/pyecell/ecell/SessionManager/SessionManager.py	2008-11-06 01:35:42 UTC (rev 3274)
+++ ecell3/branches/ecell-3.1/ecell/pyecell/ecell/SessionManager/SessionManager.py	2008-11-06 09:01:56 UTC (rev 3275)
@@ -826,12 +826,10 @@
         # creates AbstractSessionProxy
         job = self.__theSystemProxy.createSessionProxy()
         job.setScriptFileName( ess )
-        job.setInterpreter( ECELL3_PYTHON )
+        job.setInterpreter( ECELL3_SESSION )
         job.setArguments(
             (
-                ECELL3_SESSION,
-                '-e', ess,
-                '--parameters', str( arguments )
+                '--parameters=' + str( arguments ),
                 ) )
         job.setEnvironmentVariable( 'ECELL3_DM_PATH', dmpath )
         for i in INTERESTING_ENV_VARS:

Modified: ecell3/branches/ecell-3.1/ecell/pyecell/ecell3-session-manager.in
===================================================================
--- ecell3/branches/ecell-3.1/ecell/pyecell/ecell3-session-manager.in	2008-11-06 01:35:42 UTC (rev 3274)
+++ ecell3/branches/ecell-3.1/ecell/pyecell/ecell3-session-manager.in	2008-11-06 09:01:56 UTC (rev 3275)
@@ -152,7 +152,7 @@
 
     # gets options
     try:
-        opts, args = getopt.getopt(
+        opts, args = getopt.gnu_getopt(
             argv[ 1: ] , 'he:f:D:c:E:O:',
             [
                 "parameters=",

Modified: ecell3/branches/ecell-3.1/ecell/pyecell/ecell3-session.in
===================================================================
--- ecell3/branches/ecell-3.1/ecell/pyecell/ecell3-session.in	2008-11-06 01:35:42 UTC (rev 3274)
+++ ecell3/branches/ecell-3.1/ecell/pyecell/ecell3-session.in	2008-11-06 09:01:56 UTC (rev 3275)
@@ -138,7 +138,7 @@
     # gets options
     # -------------------------------------
     try:
-        opts, args = getopt.getopt(
+        opts, args = getopt.gnu_getopt(
             sys.argv[ 1: ] , 'he:f:D:',
             [ "parameters=", "help", "exec=", "file=" ] )
     except:


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.