You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ambari.apache.org by ao...@apache.org on 2016/07/08 15:52:21 UTC

[2/2] ambari git commit: AMBARI-17620. Syntax error in 'setup_ranger_xml.py' logging. (aonishuk)

AMBARI-17620. Syntax error in 'setup_ranger_xml.py' logging. (aonishuk)


Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/f37945cc
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/f37945cc
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/f37945cc

Branch: refs/heads/branch-2.4
Commit: f37945cc10556f82c2e0e7441bf66ec4d5148c80
Parents: cade1d5
Author: Andrew Onishuk <ao...@hortonworks.com>
Authored: Fri Jul 8 18:52:08 2016 +0300
Committer: Andrew Onishuk <ao...@hortonworks.com>
Committed: Fri Jul 8 18:52:08 2016 +0300

----------------------------------------------------------------------
 .../RANGER/0.4.0/package/scripts/setup_ranger_xml.py            | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/ambari/blob/f37945cc/ambari-server/src/main/resources/common-services/RANGER/0.4.0/package/scripts/setup_ranger_xml.py
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/common-services/RANGER/0.4.0/package/scripts/setup_ranger_xml.py b/ambari-server/src/main/resources/common-services/RANGER/0.4.0/package/scripts/setup_ranger_xml.py
index 9dbf6d4..051310e 100644
--- a/ambari-server/src/main/resources/common-services/RANGER/0.4.0/package/scripts/setup_ranger_xml.py
+++ b/ambari-server/src/main/resources/common-services/RANGER/0.4.0/package/scripts/setup_ranger_xml.py
@@ -286,9 +286,8 @@ def copy_jdbc_connector(stack_version=None):
   import params
 
   if params.jdbc_jar_name is None and params.driver_curl_source.endswith("/None"):
-    error_message = "Error! Sorry, but we can't find jdbc driver related to {0} database to download from {1}. \
-    Please run 'ambari-server setup --jdbc-db={db_name} --jdbc-driver={path_to_jdbc} on server host.'".format(params.db_flavor, params.jdk_location)
-    Logger.error(error_message)
+    error_message = format("{db_flavor} jdbc driver cannot be downloaded from {jdk_location}\nPlease run 'ambari-server setup --jdbc-db={db_flavor} --jdbc-driver={{path_to_jdbc}}' on ambari-server host.")
+    raise Fail(error_message)
 
   if params.driver_curl_source and not params.driver_curl_source.endswith("/None"):
     if params.previous_jdbc_jar and os.path.isfile(params.previous_jdbc_jar):