Merge pull request #6 from Senzing/issue-3.dockter.1

Shipped with SenzingAPI 1.15.0

CHANGELOG.md

@@ -6,6 +6,12 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 [markdownlint](https://dlaa.me/markdownlint/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
+## [1.1.0] - 2020-04-20
+
+### Added to 1.1.0
+
+- Shipped with SenzingAPI 1.15.0
+
 ## [1.0.1] - 2019-10-22
 
 ### Added to 1.0.1

G2SetupConfig.py

@@ -99,9 +99,8 @@ def setupConfig(iniFileName,autoMode):
     # Save configuration JSON into G2 database.
     config_comment = "Configuration added from G2SetupConfig."
     new_config_id = bytearray()
-    return_code = 0;
     try:
-        return_code = g2ConfigMgr.addConfig(configJsonToUse, config_comment, new_config_id)
+        g2ConfigMgr.addConfig(configJsonToUse, config_comment, new_config_id)
     except G2Exception.G2ModuleException as exc:
         print(exc)
         exceptionInfo = g2ConfigMgr.getLastException()
@@ -111,13 +110,11 @@ def setupConfig(iniFileName,autoMode):
             return -1
         print ("Error:  Failed to add config to the datastore.")
         return -1
-    if return_code != 0:
-        print ("Error:  Failed to add config to the datastore.")
-        return -1
 
     # Set the default configuration ID.
-    return_code = g2ConfigMgr.setDefaultConfigID(new_config_id)
-    if return_code != 0:
+    try:
+        g2ConfigMgr.setDefaultConfigID(new_config_id)
+    except G2Exception.G2Exception as err:
         print ("Error:  Failed to set config as default.")
         return -1