ajack 2004/06/16 11:33:30
Modified: . Tag: CleanUp gumpy.py
python/gump/integration Tag: CleanUp depot.py
Log:
Use sys.executable to attempt to 'carry along' the Python executable
name (e.g. /usr/bin/python2.3 for Python.org RPM installed Python).
Revision Changes Path
No revision
No revision
1.37.2.4 +7 -1 gump/gumpy.py
Index: gumpy.py
===================================================================
RCS file: /home/cvs/gump/gumpy.py,v
retrieving revision 1.37.2.3
retrieving revision 1.37.2.4
diff -u -r1.37.2.3 -r1.37.2.4
--- gumpy.py 16 Jun 2004 17:50:39 -0000 1.37.2.3
+++ gumpy.py 16 Jun 2004 18:33:30 -0000 1.37.2.4
@@ -294,6 +294,7 @@
log.write('- GUMP run @ : ' + time.strftime('%d %b %y %H:%M:%S',
time.localtime()) + '\n')
log.write('- GUMP run @ UTC : ' + time.strftime('%d %b %y %H:%M:%S',
time.gmtime()) + '\n')
log.write('- GUMP run by Python : ' + `sys.version` + '\n')
+ log.write('- GUMP run by Python : ' + `sys.executable` + '\n')
log.write('- GUMP run by Gumpy : ' + GUMPY_VERSION + '\n')
log.write('- GUMP run on OS : ' + `os.name` + '\n')
log.write('- GUMP run in env : \n')
@@ -318,6 +319,11 @@
projectsExpr=args[1]
del args[1:2]
+ # Check version information
+ (major, minor, micro, releaselevel, serial) = sys.version_info
+ if not major >=2 and minor >= 3:
+ raise RuntimeError('Gump requires Python 2.3 or above. [' +
sys.version() + ']')
+
# Nope, can't find the workspace...
if not os.path.exists(workspacePath):
raise RuntimeError('No such workspace at ' + str(workspacePath))
@@ -413,7 +419,7 @@
command='gump/integrate.py'
if check:
command='gump/check.py'
- integrationExit = runCommand('python '+command, iargs, 'python')
+ integrationExit = runCommand(sys.executable+ ' '+command, iargs,
'python')
if integrationExit:
result=1
No revision
No revision
1.1.2.3 +2 -1 gump/python/gump/integration/Attic/depot.py
Index: depot.py
===================================================================
RCS file: /home/cvs/gump/python/gump/integration/Attic/depot.py,v
retrieving revision 1.1.2.2
retrieving revision 1.1.2.3
diff -u -r1.1.2.2 -r1.1.2.3
--- depot.py 14 Jun 2004 21:31:47 -0000 1.1.2.2
+++ depot.py 16 Jun 2004 18:33:30 -0000 1.1.2.3
@@ -18,6 +18,7 @@
Manage Depot Interactions
"""
import os
+import sys
from gump import log
from gump.core.config import *
@@ -37,7 +38,7 @@
def getDepotUpdateCmd():
- return 'python '+getDepotUpdatePath()
+ return sys.executable+getDepotUpdatePath()
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
