Changeset: 5df6cbe2473d for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=5df6cbe2473d
Modified Files:
configure.ag
Branch: Apr2011
Log Message:
CentOS 6.0 has an extra "Linux" in /etc/centos-release.
(transplanted from 1b043f1425555974dae8356cc3f8f211da094fb9)
diffs (21 lines):
diff --git a/configure.ag b/configure.ag
--- a/configure.ag
+++ b/configure.ag
@@ -441,7 +441,7 @@
| sed 's|^.*\(Fedora\).* release \([[0-9]][[^ \n]]*\)\(
.*\)*$|\1:\2|'`"
elif test -s /etc/centos-release ; then
LINUX_DIST="`cat /etc/centos-release | head -n1 \
- | sed 's|^\(CentOS\) release \([[0-9]][[^ \n]]*\)\(
.*\)*$|\1:\2|'`"
+ | sed 's|^\(CentOS\).* release \([[0-9]][[^ \n]]*\)\(
.*\)*$|\1:\2|'`"
elif test -s /etc/yellowdog-release ; then
LINUX_DIST="`cat /etc/yellowdog-release | head -n1 \
| sed 's|^\(Yellow\) Dog Linux release \([[0-9]][[^
\n]]*\)\( .*\)*$|\1:\2|'`"
@@ -449,7 +449,7 @@
LINUX_DIST="`cat /etc/redhat-release | head -n1 \
| sed 's|^.*\(Red\) \(Hat\).* Linux *\([[A-Z]]*\)
release \([[0-9]][[^ \n]]*\)\( .*\)*$|\1\2:\4\3|' \
| sed 's|^Red Hat Enterprise Linux \([[AW]]S\) release
\([[0-9]][[^ \n]]*\)\( .*\)*$|RHEL:\2\1|' \
- | sed 's|^\(CentOS\) release \([[0-9]][[^ \n]]*\)\(
.*\)*$|\1:\2|' \
+ | sed 's|^\(CentOS\).* release \([[0-9]][[^ \n]]*\)\(
.*\)*$|\1:\2|' \
| sed 's|^\(Scientific\) Linux SL release \([[0-9]][[^
\n]]*\)\( .*\)*$|\1:\2|'`"
elif test -s /etc/SuSE-release ; then
LINUX_DIST="`cat /etc/SuSE-release | head -n1 \
_______________________________________________
Checkin-list mailing list
[email protected]
http://mail.monetdb.org/mailman/listinfo/checkin-list
