Repository: ambari
Updated Branches:
  refs/heads/branch-2.4 54e52197c -> b637bb15c


AMBARI-18637: Management pack purge option should warn user and ask for 
confirmation before purging - addendum (jluniya)


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

Branch: refs/heads/branch-2.4
Commit: b637bb15c5955b497c9573c3c84b5a12e09bf6ef
Parents: 54e5219
Author: Jayush Luniya <[email protected]>
Authored: Tue Nov 15 11:39:16 2016 -0800
Committer: Jayush Luniya <[email protected]>
Committed: Tue Nov 15 11:39:16 2016 -0800

----------------------------------------------------------------------
 ambari-server/src/main/python/ambari_server/setupMpacks.py | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/ambari/blob/b637bb15/ambari-server/src/main/python/ambari_server/setupMpacks.py
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/python/ambari_server/setupMpacks.py 
b/ambari-server/src/main/python/ambari_server/setupMpacks.py
index a70e75e..cdbdd16 100644
--- a/ambari-server/src/main/python/ambari_server/setupMpacks.py
+++ b/ambari-server/src/main/python/ambari_server/setupMpacks.py
@@ -637,7 +637,9 @@ def _install_mpack(options, replay_mode=False, 
is_upgrade=False):
     _execute_hook(mpack_metadata, BEFORE_INSTALL_HOOK_NAME, tmp_root_dir)
 
   # Purge previously installed stacks and management packs
-  if options.purge and options.purge_list:
+  if options.purge:
+    if not 'purge_list' in options:
+      options.purge_list = ",".join([STACK_DEFINITIONS_RESOURCE_NAME, 
MPACKS_RESOURCE_NAME])
     purge_resources = options.purge_list.split(",")
     validate_purge(options, purge_resources, tmp_root_dir, mpack_metadata, 
replay_mode)
     purge_stacks_and_mpacks(purge_resources, replay_mode)

Reply via email to