[taler-merchant] branch master updated: 0000 is reserved for versioning

[gnunet]

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 fec152c  0000 is reserved for versioning
fec152c is described below

commit fec152c989ae1951c2120d23ead468beb8017ff0
Author: Christian Grothoff <address@hidden>
AuthorDate: Mon Feb 24 12:36:26 2020 +0100

    0000 is reserved for versioning
---
 src/backenddb/Makefile.am                    |  2 +-
 src/backenddb/{drop0000.sql => drop0001.sql} |  0
 src/backenddb/plugin_merchantdb_postgres.c   | 23 -----------------------
 3 files changed, 1 insertion(+), 24 deletions(-)

diff --git a/src/backenddb/Makefile.am b/src/backenddb/Makefile.am
index 8f0479d..a8294ba 100644
--- a/src/backenddb/Makefile.am
+++ b/src/backenddb/Makefile.am
@@ -13,7 +13,7 @@ sqldir = $(prefix)/share/taler/sql/merchant/
 sql_DATA = \
   0000.sql \
   0001.sql \
-  drop0000.sql
+  drop0001.sql
 
 if HAVE_POSTGRESQL
 if HAVE_GNUNETPQ
diff --git a/src/backenddb/drop0000.sql b/src/backenddb/drop0001.sql
similarity index 100%
rename from src/backenddb/drop0000.sql
rename to src/backenddb/drop0001.sql
diff --git a/src/backenddb/plugin_merchantdb_postgres.c 
b/src/backenddb/plugin_merchantdb_postgres.c
index 55c2fc1..73269cb 100644
--- a/src/backenddb/plugin_merchantdb_postgres.c
+++ b/src/backenddb/plugin_merchantdb_postgres.c
@@ -3491,29 +3491,6 @@ libtaler_plugin_merchantdb_postgres_init (void *cls)
     GNUNET_free (pg);
     return NULL;
   }
-  ec = getenv ("TALER_MERCHANTDB_POSTGRES_CONFIG");
-  if (NULL != ec)
-  {
-    GNUNET_CONFIGURATION_set_value_string (cfg,
-                                           "merchantdb-postgres",
-                                           "CONFIG",
-                                           ec);
-  }
-  else
-  {
-    if (GNUNET_OK !=
-        GNUNET_CONFIGURATION_have_value (cfg,
-                                         "merchantdb-postgres",
-                                         "CONFIG"))
-    {
-      GNUNET_log_config_missing (GNUNET_ERROR_TYPE_ERROR,
-                                 "merchantdb-postgres",
-                                 "CONFIG");
-      GNUNET_free (pg->sql_dir);
-      GNUNET_free (pg);
-      return NULL;
-    }
-  }
   pg->conn = GNUNET_PQ_connect_with_cfg (cfg,
                                          "merchantdb-postgres",
                                          "",

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