ambari-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From aonis...@apache.org
Subject ambari git commit: AMBARI-14230. Ranger admin component stops with exception in log (aonishuk)
Date Sat, 05 Dec 2015 15:24:13 GMT
Repository: ambari
Updated Branches:
  refs/heads/branch-2.2 930fdbbf2 -> 58412e0fb


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/58412e0f
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/58412e0f
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/58412e0f

Branch: refs/heads/branch-2.2
Commit: 58412e0fba3f28f32946e0c322031b9593ec289c
Parents: 930fdbb
Author: Andrew Onishuk <aonishuk@hortonworks.com>
Authored: Sat Dec 5 17:23:21 2015 +0200
Committer: Andrew Onishuk <aonishuk@hortonworks.com>
Committed: Sat Dec 5 17:23:21 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/58412e0f/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 0817ce7..7fd64b5 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
@@ -390,12 +390,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.


Mime
View raw message