Update of /cvsroot/monetdb/MonetDB/src/testing
In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv4721/src/testing
Modified Files:
Tag: GDK-2
Mtest.py.in
Log Message:
propagated changes of Tuesday Sep 18 2007 - Monday Sep 24 2007
from the development trunk to the GDK-2 branch
Index: Mtest.py.in
===================================================================
RCS file: /cvsroot/monetdb/MonetDB/src/testing/Mtest.py.in,v
retrieving revision 1.280.2.7
retrieving revision 1.280.2.8
diff -u -d -r1.280.2.7 -r1.280.2.8
--- Mtest.py.in 18 Sep 2007 12:51:49 -0000 1.280.2.7
+++ Mtest.py.in 24 Sep 2007 09:20:27 -0000 1.280.2.8
@@ -2514,6 +2514,7 @@
if OS == "Linux":
# Please keep this aligned / in sync with buildtools/conf/MonetDB.m4 &
TestTools/.Mconfig.rc & TestTools/MdoServer !
+ LINUX_DIST=''
if os.path.isfile('/etc/fedora-release'):
l = open('/etc/fedora-release').readline()
x = re.compile('^.*(Fedora).* release ([0-9][^ \n]*)( .*)*$').match(l)
@@ -2545,10 +2546,10 @@
LINUX_DIST = '%s:%s' % (x3.group(1),x3.group(2))
elif os.path.isfile('/etc/SuSE-release'):
l = open('/etc/SuSE-release').readline()
- x0 = re.compile('^.*(SUSE) LINUX Enterprise ([SD])[ervsktop]* ([0-9][^
\n]*)( .*)*$').match(l)
- x1 = re.compile('^SUSE LINUX Enterprise ([SD])[ervsktop]* ([0-9][^
\n]*)( .*)*$').match(l)
- x2 = re.compile('^.*(SuSE) Linux.* ([0-9][^ \n]*)( .*)*$').match(l)
- x3 = re.compile('^open(SUSE) ([0-9][^ \n]*)( .*)*$').match(l)
+ x0 = re.compile('^.*(S[Uu]SE) LINUX Enterprise ([SD])[ervsktop]*
([0-9][^ \n]*)( .*)*$').match(l)
+ x1 = re.compile('^S[Uu]SE LINUX Enterprise ([SD])[ervsktop]* ([0-9][^
\n]*)( .*)*$').match(l)
+ x2 = re.compile('^.*(S[Uu]SE) [Ll][Ii][Nn][Uu][Xx].* ([0-9][^ \n]*)(
.*)*$').match(l)
+ x3 = re.compile('^open(S[Uu]SE) ([0-9][^ \n]*)( .*)*$').match(l)
if x0:
LINUX_DIST = '%s:%sE%s' % (x0.group(1),x0.group(3),x0.group(2))
elif x1:
@@ -2564,7 +2565,7 @@
LINUX_DIST = '%s:%s' % (x.group(1),x.group(2))
elif os.path.isfile('/etc/debian_version'):
LINUX_DIST = "Debian:"+open('/etc/debian_version').readline().strip()
- else:
+ if not LINUX_DIST:
LINUX_DIST =
OS+':'+re.compile('^([0-9\.]*)([^0-9\.].*)$').match(RELEASE).group(1)
DIST,VERSION = LINUX_DIST.split(':', 1)
else:
-------------------------------------------------------------------------
This SF.net email is sponsored by: Microsoft
Defy all challenges. Microsoft(R) Visual Studio 2005.
http://clk.atdmt.com/MRT/go/vse0120000070mrt/direct/01/
_______________________________________________
Monetdb-checkins mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/monetdb-checkins
