[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[taler-merchant] branch master updated: -preps for 0.8.1
|
From: |
gnunet |
|
Subject: |
[taler-merchant] branch master updated: -preps for 0.8.1 |
|
Date: |
Fri, 13 Aug 2021 23:14:16 +0200 |
This is an automated email from the git hooks/post-receive script.
grothoff pushed a commit to branch master
in repository merchant.
The following commit(s) were added to refs/heads/master by this push:
new 80a224c1 -preps for 0.8.1
80a224c1 is described below
commit 80a224c1f0fc64c75c15b525c6d78e607f3351f3
Author: Christian Grothoff <christian@grothoff.org>
AuthorDate: Fri Aug 13 23:14:14 2021 +0200
-preps for 0.8.1
---
configure.ac | 2 +-
contrib/merchant-backoffice | 2 +-
debian/changelog | 38 ++++++++++++++----------
doc/doxygen/taler.doxy | 2 +-
src/backend/taler-merchant-httpd_get-orders-ID.c | 15 +++++++++-
5 files changed, 39 insertions(+), 20 deletions(-)
diff --git a/configure.ac b/configure.ac
index 79ccc1f2..c971b2b1 100644
--- a/configure.ac
+++ b/configure.ac
@@ -18,7 +18,7 @@
# This configure file is in the public domain
AC_PREREQ([2.69])
-AC_INIT([taler-merchant], [0.8.0], [taler-bug@gnunet.org])
+AC_INIT([taler-merchant], [0.8.1], [taler-bug@gnunet.org])
AC_CONFIG_SRCDIR([src/backend/taler-merchant-httpd.c])
AC_CONFIG_HEADERS([taler_merchant_config.h])
# support for non-recursive builds
diff --git a/contrib/merchant-backoffice b/contrib/merchant-backoffice
index 4320467d..03c8c9b7 160000
--- a/contrib/merchant-backoffice
+++ b/contrib/merchant-backoffice
@@ -1 +1 @@
-Subproject commit 4320467db1392e5f48a4acd079f7e2a253cf9984
+Subproject commit 03c8c9b794905878175d07366267bdc01c3795b9
diff --git a/debian/changelog b/debian/changelog
index 62964f36..e09b82da 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,82 +1,88 @@
-taler-merchant (0.9.0-15) unstable; urgency=low
+taler-merchant (0.8.1) unstable; urgency=low
+
+ * Official release of GNU Taler merchant 0.8.1.
+
+ -- Christian Grothoff <grothoff@taler.net> Fri, 13 Aug 2021 23:23:21 +0200
+
+taler-merchant (0.8.0-15) unstable; urgency=low
* Update to latest upstream code.
-- Florian Dold <florian@dold.me> Fri, 06 Aug 2021 11:57:42 +0200
-taler-merchant (0.9.0-14) unstable; urgency=low
+taler-merchant (0.8.0-14) unstable; urgency=low
* Update to latest upstream code.
-- Florian Dold <florian@dold.me> Wed, 04 Aug 2021 21:51:23 +0200
-taler-merchant (0.9.0-13) unstable; urgency=low
+taler-merchant (0.8.0-13) unstable; urgency=low
* Support debhelper-compat level 12.
-- Florian Dold <florian@dold.me> Sun, 01 Aug 2021 19:37:19 +0200
-taler-merchant (0.9.0-12) unstable; urgency=low
+taler-merchant (0.8.0-12) unstable; urgency=low
* Fix broken postrm script.
-- Florian Dold <florian@dold.me> Sat, 31 Jul 2021 16:51:32 +0200
-taler-merchant (0.9.0-11) unstable; urgency=low
+taler-merchant (0.8.0-11) unstable; urgency=low
* Various packaging bugfixes.
-- Florian Dold <florian@dold.me> Sat, 31 Jul 2021 13:21:30 +0200
-taler-merchant (0.9.0-10) unstable; urgency=low
+taler-merchant (0.8.0-10) unstable; urgency=low
* Various configuration fixes.
-- Florian Dold <florian@dold.me> Fri, 30 Jul 2021 13:38:38 +0200
-taler-merchant (0.9.0-9) unstable; urgency=low
+taler-merchant (0.8.0-9) unstable; urgency=low
* Update to latest upstream code with minor bugfixes.
-- Christian Grothoff <grothoff@gnu.org> Tue, 20 Jul 2021 14:02:10 +0100
-taler-merchant (0.9.0-8) unstable; urgency=low
+taler-merchant (0.8.0-8) unstable; urgency=low
* Removed obsolete '-w' switch from taler-config calls.
-- Christian Grothoff <grothoff@gnu.org> Wed, 19 Jun 2021 16:02:10 +0100
-taler-merchant (0.9.0-7) unstable; urgency=low
+taler-merchant (0.8.0-7) unstable; urgency=low
* Fixes to build dependencies.
-- Christian Grothoff <grothoff@gnu.org> Wed, 19 Jun 2021 14:02:10 +0100
-taler-merchant (0.9.0-6) unstable; urgency=low
+taler-merchant (0.8.0-6) unstable; urgency=low
* Update to latest merchant backoffice SPA logic.
-- Christian Grothoff <grothoff@gnu.org> Thu, 17 Jun 2021 14:02:10 +0100
-taler-merchant (0.9.0-5) unstable; urgency=low
+taler-merchant (0.8.0-5) unstable; urgency=low
* Update to latest upstream code.
-- Christian Grothoff <grothoff@gnu.org> Fri, 18 Jun 2021 12:02:10 +0100
-taler-merchant (0.9.0-4) unstable; urgency=medium
+taler-merchant (0.8.0-4) unstable; urgency=medium
* Move benchmarking tool to -dev package.
-- Christian Grothoff <grothoff@gnu.org> Mon, 15 Feb 2021 12:02:10 +0100
-taler-merchant (0.9.0-3) unstable; urgency=medium
+taler-merchant (0.8.0-3) unstable; urgency=medium
* Fixed a few memory leaks.
-- Christian Grothoff <grothoff@gnu.org> Mon, 15 Feb 2021 12:02:10 +0100
-taler-merchant (0.9.0-2) unstable; urgency=medium
+taler-merchant (0.8.0-2) unstable; urgency=medium
* Fixed transactional logic issues.
* Trust exchange if master_pub matches, do not require base URL to match.
@@ -85,14 +91,14 @@ taler-merchant (0.9.0-2) unstable; urgency=medium
-- Christian Grothoff <grothoff@gnu.org> Thu, 21 Jan 2021 12:02:10 +0100
-taler-merchant (0.9.0-1) unstable; urgency=medium
+taler-merchant (0.8.0-1) unstable; urgency=medium
* Fixed database initialization.
* Fixed HTTP server integration.
-- Christian Grothoff <grothoff@gnu.org> Sat, 02 Jan 2021 00:00:00 +0000
-taler-merchant (0.9.0-0) unstable; urgency=medium
+taler-merchant (0.8.0-0) unstable; urgency=medium
* Initial Release.
diff --git a/doc/doxygen/taler.doxy b/doc/doxygen/taler.doxy
index d950911d..7d06be3c 100644
--- a/doc/doxygen/taler.doxy
+++ b/doc/doxygen/taler.doxy
@@ -5,7 +5,7 @@
#---------------------------------------------------------------------------
DOXYFILE_ENCODING = UTF-8
PROJECT_NAME = "GNU Taler: Merchant"
-PROJECT_NUMBER = 0.8.0
+PROJECT_NUMBER = 0.8.1
PROJECT_LOGO = logo.svg
OUTPUT_DIRECTORY = .
CREATE_SUBDIRS = YES
diff --git a/src/backend/taler-merchant-httpd_get-orders-ID.c
b/src/backend/taler-merchant-httpd_get-orders-ID.c
index 430a314e..29a906c6 100644
--- a/src/backend/taler-merchant-httpd_get-orders-ID.c
+++ b/src/backend/taler-merchant-httpd_get-orders-ID.c
@@ -914,7 +914,7 @@ TMH_get_orders_ID (const struct TMH_RequestHandler *rh,
{
god->claimed = true;
}
- else if (! token_match)
+ else if (! token_match) // FIXME: This 'if' seems unnecessary, 'token_match'
would seem always 'false' here.
{
struct TALER_ClaimTokenP db_claim_token;
struct GNUNET_HashCode unused;
@@ -939,6 +939,7 @@ TMH_get_orders_ID (const struct TMH_RequestHandler *rh,
TALER_EC_GENERIC_DB_FETCH_FAILED,
"lookup_order");
}
+ // FIXME: simplify: contract_available is always FALSE here!
if ( (GNUNET_DB_STATUS_SUCCESS_NO_RESULTS == qs) &&
(! contract_available) )
{
@@ -950,6 +951,9 @@ TMH_get_orders_ID (const struct TMH_RequestHandler *rh,
TALER_EC_MERCHANT_GENERIC_ORDER_UNKNOWN,
order_id);
}
+ // FIXME: given that contract_available is always
+ // false and thus qs always non-zero, the RVAL simplifies
+ // to 'false', which should already be the LVAL.
god->claimed = ( (GNUNET_DB_STATUS_SUCCESS_NO_RESULTS == qs) ||
(contract_available) );
token_match = (GNUNET_DB_STATUS_SUCCESS_ONE_RESULT == qs) &&
@@ -979,6 +983,11 @@ TMH_get_orders_ID (const struct TMH_RequestHandler *rh,
contract_available,
contract_match,
god->claimed);
+ /* FIXME: this should be strengthend: two conditions
+ (claim_token_provided && ! token_match) ||
+ (h_contract_provided && ! contract_match)
+ in separate branches with more specific error
+ replies (about token or contract) */
if ( (claim_token_provided || h_contract_provided) &&
(! (token_match || contract_match)) )
{
@@ -994,6 +1003,10 @@ TMH_get_orders_ID (const struct TMH_RequestHandler *rh,
{
const char *public_reorder_url;
+ /* FIXME: taking this branch seems wrong for unclaimed
+ orders without claim token! Also seems to contradict
+ the spec, as there 'authOk' is defined to include the
+ || "! ord.requireClaimToken" part! */
GNUNET_log (GNUNET_ERROR_TYPE_INFO,
"Neither claim token nor contract matched\n");
public_reorder_url = json_string_value (json_object_get (
--
To stop receiving notification emails like this one, please contact
gnunet@gnunet.org.
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [taler-merchant] branch master updated: -preps for 0.8.1,
gnunet <=