Changeset: c83dea3bb8e5 for MonetDB URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=c83dea3bb8e5 Modified Files: tools/merovingian/ChangeLog.Aug2011 tools/merovingian/daemon/merovingian.c Branch: Aug2011 Log Message:
merovingian: fix inversed logic for pidfile error message Solves bug #2851. Not fixing on Apr2011 branch, as it is a too minor issue to warrant a SP3. diffs (28 lines): diff --git a/tools/merovingian/ChangeLog.Aug2011 b/tools/merovingian/ChangeLog.Aug2011 --- a/tools/merovingian/ChangeLog.Aug2011 +++ b/tools/merovingian/ChangeLog.Aug2011 @@ -1,6 +1,10 @@ # ChangeLog file for sql/src/backends/monet5/merovingian # This file is updated with mchangelog +* Sat Aug 6 2011 Fabian Groffen <[email protected]> +- Fix incorrect (misleading) path for pidfile in pidfile error message, + bug #2851 + * Fri Apr 29 2011 Fabian Groffen <[email protected]> - added status property to get command diff --git a/tools/merovingian/daemon/merovingian.c b/tools/merovingian/daemon/merovingian.c --- a/tools/merovingian/daemon/merovingian.c +++ b/tools/merovingian/daemon/merovingian.c @@ -841,8 +841,8 @@ main(int argc, char *argv[]) /* make sure we will be able to write our pid */ if ((pidfile = fopen(pidfilename, "w")) == NULL) { Mfprintf(stderr, "unable to open '%s%s%s' for writing: %s\n", - pidfilename[0] == '/' ? dbfarm : "", - pidfilename[0] == '/' ? "/" : "", + pidfilename[0] != '/' ? dbfarm : "", + pidfilename[0] != '/' ? "/" : "", pidfilename, strerror(errno)); MERO_EXIT(1); } _______________________________________________ Checkin-list mailing list [email protected] http://mail.monetdb.org/mailman/listinfo/checkin-list
