MonetDB: Jan2014 - merging
Changeset: 63f90cc76c10 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=63f90cc76c10
Modified Files:
MonetDB.spec
configure.ag
Branch: Jan2014
Log Message:
merging
diffs (52 lines):
diff --git a/MonetDB.spec b/MonetDB.spec
--- a/MonetDB.spec
+++ b/MonetDB.spec
@@ -589,9 +589,9 @@ used from the MAL level.
Summary: MonetDB5 SQL server modules
Group: Applications/Databases
Requires: MonetDB5-server = %{version}-%{release}
-%if %{?rhel:0}%{!?rhel:1}
-# for systemd-tmpfiles
-Requires: systemd-units
+%if %{?rhel:0}%{!?rhel:1} || 0%{?rhel} = 7
+# RHEL = 7, and all current Fedora
+Requires: %{_bindir}/systemd-tmpfiles
%endif
Obsoletes: MonetDB-SQL-devel
Obsoletes: %{name}-SQL
@@ -605,7 +605,7 @@ accelerators. It also has an SQL fronte
This package contains the SQL frontend for MonetDB. If you want to
use SQL with MonetDB, you will need to install this package.
-%if %{?rhel:0}%{!?rhel:1}
+%if %{?rhel:0}%{!?rhel:1} || 0%{?rhel} = 7
%post SQL-server5
systemd-tmpfiles --create %{_sysconfdir}/tmpfiles.d/monetdbd.conf
%endif
@@ -615,11 +615,11 @@ systemd-tmpfiles --create %{_sysconfdir}
%{_bindir}/monetdb
%{_bindir}/monetdbd
%dir %attr(775,monetdb,monetdb) %{_localstatedir}/log/monetdb
-%if %{?rhel:0}%{!?rhel:1}
-# Fedora 15 and newer
+%if %{?rhel:0}%{!?rhel:1} || 0%{?rhel} = 7
+# RHEL = 7, and all current Fedora
%{_sysconfdir}/tmpfiles.d/monetdbd.conf
%else
-# RedHat Enterprise Linux
+# RedHat Enterprise Linux 7
%dir %attr(775,monetdb,monetdb) %{_localstatedir}/run/monetdb
%exclude %{_sysconfdir}/tmpfiles.d/monetdbd.conf
%endif
diff --git a/configure.ag b/configure.ag
--- a/configure.ag
+++ b/configure.ag
@@ -486,7 +486,7 @@ case $host_os in
if test -s /etc/os-release; then
# this is the new way of getting release information
# works for Fedora = 17, Ubuntu = 12.04 (Precise Pangolin)
- LINUX_DIST=`source /etc/os-release; echo ${NAME}:${VERSION_ID}`
+ LINUX_DIST=`source /etc/os-release; echo ${ID}:${VERSION_ID}`
elif test -s /etc/fedora-release ; then
LINUX_DIST=`cat /etc/fedora-release | head -n1 \
| sed 's|^.*\(Fedora\).* release \([[0-9]][[^ \n]]*\)\(
.*\)*$|\1:\2|'`
___
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list
MonetDB: Jan2014 - Merging heads --- sorry, forgot --rebase wi...
Changeset: 55349c1d2524 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=55349c1d2524
Modified Files:
tools/merovingian/client/monetdb.c
Branch: Jan2014
Log Message:
Merging heads --- sorry, forgot --rebase with hg pull --update
diffs (38 lines):
diff --git a/tools/merovingian/client/monetdb.c
b/tools/merovingian/client/monetdb.c
--- a/tools/merovingian/client/monetdb.c
+++ b/tools/merovingian/client/monetdb.c
@@ -1711,17 +1711,14 @@ main(int argc, char *argv[])
* where we should search, which defaults to '/tmp' */
if (mero_host == NULL)
mero_host = /tmp;
- do {
- /* first try the port given (or else its default) */
- snprintf(buf, sizeof(buf), %s/.s.merovingian.%d,
- mero_host, mero_port == -1 ? 5 :
mero_port);
- if (control_ping(buf, -1, NULL) == 0) {
- mero_host = buf;
- break;
- }
-
- /* if port wasn't given, we can try and search for
available
-* sockets */
+ /* first try the port given (or else its default) */
+ snprintf(buf, sizeof(buf), %s/.s.merovingian.%d,
+mero_host, mero_port == -1 ? 5 : mero_port);
+ if (control_ping(buf, -1, NULL) == 0) {
+ mero_host = buf;
+ } else {
+ /* if port wasn't given, we can try and search
+* for available sockets */
if (mero_port == -1) {
DIR *d;
struct dirent *e;
@@ -1747,7 +1744,7 @@ main(int argc, char *argv[])
}
closedir(d);
}
- } while(0);
+ }
if (mero_host != buf) {
fprintf(stderr, monetdb: cannot find a control socket,
use -h and/or -p\n);
___
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list
