On 2011-07-13 09:47, Stefan Manegold wrote:
> Changeset: 664cc772d7cf for MonetDB
> URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=664cc772d7cf
> Modified Files:
> configure.ag
> testing/Mtest.py.in
> Branch: Apr2011
> Log Message:
>
> CentOS 6.0 has an extra "Linux" in /etc/centos-release:
>
> Re-aligned testing/Mtest.py.in with configure.ag
> and re-added comment that documents the alignment.
Can't we just use
LINUX_DIST = '@LINUX_DIST@'
? configure already figured it out.
>
> diffs (41 lines):
>
> diff --git a/configure.ag b/configure.ag
> --- a/configure.ag
> +++ b/configure.ag
> @@ -435,6 +435,7 @@
> LINUX_DIST=''
> case "$host_os" in
> linux*)
> + dnl Please keep this aligned / in sync with testing/Mtest.py.in !
> AC_MSG_CHECKING(which Linux distribution we're using)
> if test -s /etc/fedora-release ; then
> LINUX_DIST="`cat /etc/fedora-release | head -n1 \
> diff --git a/testing/Mtest.py.in b/testing/Mtest.py.in
> --- a/testing/Mtest.py.in
> +++ b/testing/Mtest.py.in
> @@ -2769,7 +2769,7 @@
> RELEASE = "5.2"
>
> if SYST == "Linux":
> - # Please keep this aligned / in sync with configure.ag &
> TestTools/.Mconfig.rc & TestTools/MdoServer !
> + # Please keep this aligned / in sync with configure.ag !
> LINUX_DIST=''
> if os.path.isfile('/etc/fedora-release'):
> l = open('/etc/fedora-release').readline()
> @@ -2778,7 +2778,7 @@
> LINUX_DIST = '%s:%s' % (x.group(1),x.group(2))
> elif os.path.isfile('/etc/centos-release'):
> l = open('/etc/centos-release').readline()
> - x = re.compile('^(CentOS) release ([0-9][^ \n]*)( .*)*$').match(l)
> + x = re.compile('^(CentOS).* release ([0-9][^ \n]*)( .*)*$').match(l)
> if x:
> LINUX_DIST = '%s:%s' % (x.group(1),x.group(2))
> elif os.path.isfile('/etc/yellowdog-release'):
> @@ -2790,7 +2790,7 @@
> l = open('/etc/redhat-release').readline()
> x0 = re.compile('^.*(Red) (Hat).* Linux *([A-Z]*) release ([0-9][^
> \n]*)( .*)*$').match(l)
> x1 = re.compile('^Red Hat Enterprise Linux ([AW]S) release ([0-9][^
> \n]*)( .*)*$').match(l)
> - x2 = re.compile('^(CentOS) release ([0-9][^ \n]*)( .*)*$').match(l)
> + x2 = re.compile('^(CentOS).* release ([0-9][^ \n]*)( .*)*$').match(l)
> x3 = re.compile('^(Scientific) Linux SL release ([0-9][^ \n]*)(
> .*)*$').match(l)
> if x0:
> LINUX_DIST = '%s%s:%s%s' %
> (x0.group(1),x0.group(2),x0.group(4),x0.group(3))
> _______________________________________________
> Checkin-list mailing list
> [email protected]
> http://mail.monetdb.org/mailman/listinfo/checkin-list
--
Sjoerd Mullender
_______________________________________________
Checkin-list mailing list
[email protected]
http://mail.monetdb.org/mailman/listinfo/checkin-list
