Update of /cvsroot/monetdb/MonetDB/src/testing
In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv27968/src/testing
Modified Files:
Mtest.py.in
Log Message:
fixed Windows version number detection
Index: Mtest.py.in
===================================================================
RCS file: /cvsroot/monetdb/MonetDB/src/testing/Mtest.py.in,v
retrieving revision 1.326
retrieving revision 1.327
diff -u -d -r1.326 -r1.327
--- Mtest.py.in 6 Dec 2007 20:51:37 -0000 1.326
+++ Mtest.py.in 7 Dec 2007 15:46:53 -0000 1.327
@@ -2576,10 +2576,10 @@
OS = "Windows"
RELEASE = "5.0"
r = re.compile('^Microsoft Windows (.*)\[Version
([0-9]+\.[0-9]+)([^\[0-9].*)\]$')
- proc = subprocess.Popen('ver', stdin = subprocess.PIPE, stdout =
subprocess.PIPE, universal_newlines = True)
+ proc = subprocess.Popen('cmd /c ver', stdin = subprocess.PIPE, stdout =
subprocess.PIPE, universal_newlines = True)
qOut, qErr = proc.communicate()
for l in qOut.split('\n'):
- m = r.match(i.strip())
+ m = r.match(l.strip())
if m and m.group(2):
RELEASE = m.group(2)
else:
-------------------------------------------------------------------------
SF.Net email is sponsored by:
Check out the new SourceForge.net Marketplace.
It's the best place to buy or sell services for
just about anything Open Source.
http://sourceforge.net/services/buy/index.php
_______________________________________________
Monetdb-checkins mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/monetdb-checkins
