Update of /cvsroot/monetdb/sql/src/backends/monet5/merovingian
In directory 23jxhf1.ch3.sourceforge.com:/tmp/cvs-serv11050
Modified Files:
ChangeLog monetdb.c
Log Message:
Implemented global -q option to monetdb to suppress status messages when
performing commands
U monetdb.c
Index: monetdb.c
===================================================================
RCS file: /cvsroot/monetdb/sql/src/backends/monet5/merovingian/monetdb.c,v
retrieving revision 1.62
retrieving revision 1.63
diff -u -d -r1.62 -r1.63
--- monetdb.c 23 Sep 2009 16:22:44 -0000 1.62
+++ monetdb.c 25 Sep 2009 09:09:12 -0000 1.63
@@ -210,7 +210,7 @@
if (argv[i] == NULL)
continue;
- if (premsg != NULL) {
+ if (premsg != NULL && !monetdb_quiet) {
printf("%s '%s'... ", premsg, argv[i]);
fflush(stdout);
}
@@ -219,7 +219,7 @@
argv[i], merocmd, 0, mero_pass);
if (ret != NULL) {
- if (premsg != NULL)
+ if (premsg != NULL && !monetdb_quiet)
printf("FAILED\n");
fprintf(stderr, "%s: failed to perform command: %s\n",
argv[0], ret);
@@ -228,13 +228,15 @@
}
if (strcmp(out, "OK") == 0) {
- if (premsg != NULL) {
- printf("done\n");
- } else {
- printf("%s: %s\n", successmsg, argv[i]);
+ if (!monetdb_quiet) {
+ if (premsg != NULL) {
+ printf("done\n");
+ } else {
+ printf("%s: %s\n", successmsg, argv[i]);
+ }
}
} else {
- if (premsg != NULL)
+ if (premsg != NULL && !monetdb_quiet)
printf("FAILED\n");
fprintf(stderr, "%s: %s\n", argv[0], out);
free(out);
U ChangeLog
Index: ChangeLog
===================================================================
RCS file: /cvsroot/monetdb/sql/src/backends/monet5/merovingian/ChangeLog,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -d -r1.28 -r1.29
--- ChangeLog 25 Sep 2009 08:55:19 -0000 1.28
+++ ChangeLog 25 Sep 2009 09:09:12 -0000 1.29
@@ -1,6 +1,10 @@
# ChangeLog file for sql/src/backends/monet5
# This file is updated with mchangelog (Gentoo echangelog bastard script)
+ 25 Sep 2009; Fabian Groffen <[email protected]> monetdb.c:
+ Implemented global -q option to monetdb to suppress status messages when
+ performing commands
+
25 Sep 2009; Fabian Groffen <[email protected]> glob.c:
Improved globbing to support escapes, such that the literal asterisk symbol
can be matched using \*
------------------------------------------------------------------------------
Come build with us! The BlackBerry® Developer Conference in SF, CA
is the only developer event you need to attend this year. Jumpstart your
developing skills, take BlackBerry mobile applications to market and stay
ahead of the curve. Join us from November 9-12, 2009. Register now!
http://p.sf.net/sfu/devconf
_______________________________________________
Monetdb-sql-checkins mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/monetdb-sql-checkins
