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 2015/12/05 16:21:13 UTC
ambari git commit: AMBARI-14230. Ranger admin component stops with
exception in log (aonishuk)
Repository: ambari
Updated Branches:
refs/heads/trunk 7d6f28d97 -> 96088ab7a
AMBARI-14230. Ranger admin component stops with exception in log (aonishuk)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/96088ab7
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/96088ab7
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/96088ab7
Branch: refs/heads/trunk
Commit: 96088ab7aa3347602bba73af35827010eadaf20c
Parents: 7d6f28d
Author: Andrew Onishuk <ao...@hortonworks.com>
Authored: Sat Dec 5 17:20:32 2015 +0200
Committer: Andrew Onishuk <ao...@hortonworks.com>
Committed: Sat Dec 5 17:20:32 2015 +0200
----------------------------------------------------------------------
.../resource_management/libraries/functions/conf_select.py | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ambari/blob/96088ab7/ambari-common/src/main/python/resource_management/libraries/functions/conf_select.py
----------------------------------------------------------------------
diff --git a/ambari-common/src/main/python/resource_management/libraries/functions/conf_select.py b/ambari-common/src/main/python/resource_management/libraries/functions/conf_select.py
index 633ab7c..c9c70de 100644
--- a/ambari-common/src/main/python/resource_management/libraries/functions/conf_select.py
+++ b/ambari-common/src/main/python/resource_management/libraries/functions/conf_select.py
@@ -388,12 +388,12 @@ def convert_conf_directories_to_symlinks(package, version, dirs, skip_existing_l
old_conf = dir_def['conf_dir']
versioned_conf = need_dir
Execute(as_sudo(["cp", "-R", "-p", os.path.join(old_conf, "*"), versioned_conf], auto_escape=False),
- only_if = format("ls {old_conf}/*"))
+ only_if = format("ls -d {old_conf}/*"))
elif 1 == len(dirs) and 1 == len(need_dirs):
old_conf = dirs[0]['conf_dir']
versioned_conf = need_dirs[0]
Execute(as_sudo(["cp", "-R", "-p", os.path.join(old_conf, "*"), versioned_conf], auto_escape=False),
- only_if = format("ls {old_conf}/*"))
+ only_if = format("ls -d {old_conf}/*"))
# make /usr/hdp/[version]/[component]/conf point to the versioned config.