ambari-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jlun...@apache.org
Subject ambari git commit: AMBARI-18763: Ambari upgrade fails when add-on mpack is installed (jluniya)
Date Tue, 01 Nov 2016 17:49:22 GMT
Repository: ambari
Updated Branches:
  refs/heads/trunk c143be331 -> cc14719c7


AMBARI-18763: Ambari upgrade fails when add-on mpack is installed (jluniya)


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

Branch: refs/heads/trunk
Commit: cc14719c774097af24faa559000fb3b714266802
Parents: c143be3
Author: Jayush Luniya <jluniya@hortonworks.com>
Authored: Tue Nov 1 10:49:18 2016 -0700
Committer: Jayush Luniya <jluniya@hortonworks.com>
Committed: Tue Nov 1 10:49:18 2016 -0700

----------------------------------------------------------------------
 ambari-server/src/main/python/ambari_server/serverUpgrade.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/ambari/blob/cc14719c/ambari-server/src/main/python/ambari_server/serverUpgrade.py
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/python/ambari_server/serverUpgrade.py b/ambari-server/src/main/python/ambari_server/serverUpgrade.py
index 7e321c1..7d7a9ab 100644
--- a/ambari-server/src/main/python/ambari_server/serverUpgrade.py
+++ b/ambari-server/src/main/python/ambari_server/serverUpgrade.py
@@ -544,7 +544,7 @@ def restore_custom_services():
         continue
 
       # process dirs only
-      if os.path.isdir(backup_service):
+      if os.path.isdir(backup_service) and not os.path.islink(backup_service):
         service_name = os.path.basename(backup_service)
         if not service_name in managed_services:
           shutil.copytree(backup_service, os.path.join(current_base_service_dir,service_name))


Mime
View raw message