ambari-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From aonis...@apache.org
Subject [1/2] ambari git commit: AMBARI-15404. File resource timed out (aonishuk)
Date Tue, 15 Mar 2016 16:25:13 GMT
Repository: ambari
Updated Branches:
  refs/heads/branch-2.2 cecacfc96 -> 5a3155fd2
  refs/heads/trunk 5e093c9eb -> 044673b76


AMBARI-15404. File resource timed out (aonishuk)


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

Branch: refs/heads/trunk
Commit: 044673b768abe71e239dbd350576f8ad23d6490e
Parents: 5e093c9
Author: Andrew Onishuk <aonishuk@hortonworks.com>
Authored: Tue Mar 15 18:25:00 2016 +0200
Committer: Andrew Onishuk <aonishuk@hortonworks.com>
Committed: Tue Mar 15 18:25:00 2016 +0200

----------------------------------------------------------------------
 .../src/main/python/resource_management/core/providers/system.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/ambari/blob/044673b7/ambari-common/src/main/python/resource_management/core/providers/system.py
----------------------------------------------------------------------
diff --git a/ambari-common/src/main/python/resource_management/core/providers/system.py b/ambari-common/src/main/python/resource_management/core/providers/system.py
index b4d85e4..914c902 100644
--- a/ambari-common/src/main/python/resource_management/core/providers/system.py
+++ b/ambari-common/src/main/python/resource_management/core/providers/system.py
@@ -100,8 +100,8 @@ def _ensure_metadata(path, user, group, mode=None, cd_access=None, recursive_own
     if not re.match("^[ugoa]+$", cd_access):
       raise Fail("'cd_acess' value '%s' is not valid" % (cd_access))
     
-    dir_path = path
-    while not os.path.samefile(dir_path, os.sep):
+    dir_path = re.sub('/+', '/', path)
+    while dir_path != os.sep:
       if sudo.path_isdir(dir_path):
         sudo.chmod_extended(dir_path, cd_access+"+rx")
         


Mime
View raw message