diff options
| author | Jeff Burdges <burdges@gnunet.org> | 2016-04-29 14:51:43 +0200 |
|---|---|---|
| committer | Jeff Burdges <burdges@gnunet.org> | 2016-04-29 14:51:43 +0200 |
| commit | 872d9056b53f0f3258d6bd4055466b494db9aba3 (patch) | |
| tree | 78dcfc2d6bd4f9678b36693269089723433f1369 /src | |
| parent | a9f5958d16a6467c763f7b4d1b4872a8006572cb (diff) | |
| parent | 2c3dc44a20c2b736182a07c8b50cae340b5a8dbd (diff) | |
Merge branch 'master' of git.taler.net:/var/git/exchange
Diffstat (limited to 'src')
| -rw-r--r-- | src/exchange/taler-exchange-httpd_db.c | 2 | ||||
| -rw-r--r-- | src/exchangedb/Makefile.am | 8 |
2 files changed, 4 insertions, 6 deletions
diff --git a/src/exchange/taler-exchange-httpd_db.c b/src/exchange/taler-exchange-httpd_db.c index 1e392c58..4b6b458c 100644 --- a/src/exchange/taler-exchange-httpd_db.c +++ b/src/exchange/taler-exchange-httpd_db.c @@ -246,7 +246,7 @@ TMH_DB_execute_deposit (struct MHD_Connection *connection, } COMMIT_TRANSACTION(session, connection); - GNUNET_assert (GNUNET_OK == + GNUNET_assert (GNUNET_SYSERR != TALER_amount_subtract (&amount_without_fee, &deposit->amount_with_fee, &deposit->deposit_fee)); diff --git a/src/exchangedb/Makefile.am b/src/exchangedb/Makefile.am index 0c6a7313..83be82a2 100644 --- a/src/exchangedb/Makefile.am +++ b/src/exchangedb/Makefile.am @@ -14,7 +14,9 @@ pkgcfg_DATA = \ EXTRA_DIST = \ exchangedb.conf \ - exchangedb-postgres.conf + exchangedb-postgres.conf \ + plugin_exchangedb_common.c \ + test-exchange-db-postgres.conf plugindir = $(libdir)/taler @@ -24,10 +26,6 @@ plugin_LTLIBRARIES = \ libtaler_plugin_exchangedb_postgres.la endif -EXTRA_DIST = \ - plugin_exchangedb_common.c \ - test-exchange-db-postgres.conf - libtaler_plugin_exchangedb_postgres_la_SOURCES = \ plugin_exchangedb_postgres.c libtaler_plugin_exchangedb_postgres_la_LIBADD = \ |