[GNUnet-SVN] [taler-merchant] branch master updated (a130158 -> 50c7fe8)

[gnunet]

This is an automated email from the git hooks/post-receive script.

marcello pushed a change to branch master
in repository merchant.

    from a130158  add nonce only when proposal is requested
     new d9a0005  missing parenthesis
     new 50c7fe8  Addressing #5015.

The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "add" were already present in the repository and have only
been added to this reference.


Summary of changes:
 doc/Makefile.am                            |  1 +
 doc/taler-merchant-generate-payments.1     | 50 ++++++++++++++++++++++++++++++
 src/backenddb/plugin_merchantdb_postgres.c |  2 +-
 3 files changed, 52 insertions(+), 1 deletion(-)
 create mode 100644 doc/taler-merchant-generate-payments.1

diff --git a/doc/Makefile.am b/doc/Makefile.am
index e20e333..9481e41 100644
--- a/doc/Makefile.am
+++ b/doc/Makefile.am
@@ -13,6 +13,7 @@ AM_MAKEINFOHTMLFLAGS = --no-split --css-ref=docstyle.css 
--css-ref=brown-paper.c
 
 man_MANS = \
   taler-merchant-tip-enable.1 \
+  taler-merchant-generate-payments.1 \
   taler-merchant-httpd.1
 
 info_TEXINFOS = manual.texi
diff --git a/doc/taler-merchant-generate-payments.1 
b/doc/taler-merchant-generate-payments.1
new file mode 100644
index 0000000..a848f2c
--- /dev/null
+++ b/doc/taler-merchant-generate-payments.1
@@ -0,0 +1,50 @@
+.TH TALER\-MERCHANT\-GENERATE\-PAYMENTS 1 "Nov 4, 2017" "GNU Taler"
+
+.SH NAME
+taler\-merchant\-generate\-payments \- Generate Taler\-style fake payments.
+
+.SH SYNOPSIS
+.B taler\-merchant\-httpd
+.RI [ options ]
+.br
+
+.SH DESCRIPTION
+\fBtaler\-merchant\-generate\-payments\fP is a command line tool to populate 
your merchant database with fake Taler\-style payments.
+
+.SH OPTIONS
+.B
+.IP "\-n TIMES,  \-\-times TIMES"
+Generate TIMES payments.
+
+.B
+.IP "\-b,  \-\-remote\-bank"
+If given, use the bank specified in the configuration.  Without this option, 
the "fake bank" will be started on port 8888.
+
+.B
+.IP "\-e,  \-\-remote\-exchange"
+Do not fork any exchange, so the payments will be executed against the 
exchange specified in the configuration.
+
+.B
+.IP "\-m, \-\-remote\-merchant"
+Do not fork any merchant.  All the payments will be executed against the 
merchant backend specified in the configuration.
+
+.B
+.IP "\-c FILENAME,  \-\-config=FILENAME"
+Use the configuration and other resources for the merchant to operate from 
FILENAME.
+.B
+.IP "\-h, \-\-help"
+Print short help on options.
+.B
+.IP "\-v, \-\-version"
+Print version information.
+
+.SH SIGNALS
+.B
+.IP SIGTERM
+Sending a SIGTERM to the process will cause it to shutdown cleanly.
+
+.SH BUGS
+Report bugs by using Mantis <https://gnunet.org/bugs/> or by sending 
electronic mail to <address@hidden>
+
+.SH "SEE ALSO"
+\fBtaler\-merchant\-dbinit\fP(1), \fBtaler\-merchant\-tip\-enable\fP(1), 
\fBtaler.conf\fP(5)
diff --git a/src/backenddb/plugin_merchantdb_postgres.c 
b/src/backenddb/plugin_merchantdb_postgres.c
index 5b14d31..ee8a947 100644
--- a/src/backenddb/plugin_merchantdb_postgres.c
+++ b/src/backenddb/plugin_merchantdb_postgres.c
@@ -328,7 +328,7 @@ postgres_initialize (void *cls)
                             "(order_id"
                             ",merchant_pub"
                             ",timestamp"
-                            ",contract_terms"
+                            ",contract_terms)"
                             " VALUES "
                             "($1, $2, $3, $4)",
                             4),

-- 
To stop receiving notification emails like this one, please contact
address@hidden