You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ambari.apache.org by sc...@apache.org on 2015/04/10 21:29:07 UTC

ambari git commit: AMBARI-10258 after-INSTALL hook shared_initialization.py should call compare_versions(params.hdp_stack_version, '2.2') not params.stack_version_unformatted

Repository: ambari
Updated Branches:
  refs/heads/trunk aa492e173 -> f71f175e2


AMBARI-10258 after-INSTALL hook shared_initialization.py should call compare_versions(params.hdp_stack_version, '2.2') not params.stack_version_unformatted


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

Branch: refs/heads/trunk
Commit: f71f175e2742c790e02990b4bdbfb534e9523191
Parents: aa492e1
Author: Scott Creeley <sc...@redhat.com>
Authored: Fri Apr 10 15:28:13 2015 -0400
Committer: Scott Creeley <sc...@redhat.com>
Committed: Fri Apr 10 15:28:32 2015 -0400

----------------------------------------------------------------------
 .../HDP/2.0.6/hooks/after-INSTALL/scripts/shared_initialization.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/ambari/blob/f71f175e/ambari-server/src/main/resources/stacks/HDP/2.0.6/hooks/after-INSTALL/scripts/shared_initialization.py
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/HDP/2.0.6/hooks/after-INSTALL/scripts/shared_initialization.py b/ambari-server/src/main/resources/stacks/HDP/2.0.6/hooks/after-INSTALL/scripts/shared_initialization.py
index 83c6675..19e9717 100644
--- a/ambari-server/src/main/resources/stacks/HDP/2.0.6/hooks/after-INSTALL/scripts/shared_initialization.py
+++ b/ambari-server/src/main/resources/stacks/HDP/2.0.6/hooks/after-INSTALL/scripts/shared_initialization.py
@@ -23,7 +23,7 @@ def setup_hdp_install_directory():
   # This is a name of marker file.
   SELECT_ALL_PERFORMED_MARKER = "/var/lib/ambari-agent/data/hdp-select-set-all.performed"
   import params
-  if params.hdp_stack_version != "" and compare_versions(params.stack_version_unformatted, '2.2') >= 0:
+  if params.hdp_stack_version != "" and compare_versions(params.hdp_stack_version, '2.2') >= 0:
     Execute(as_sudo(['touch', SELECT_ALL_PERFORMED_MARKER]) + ' ; ' +
                    format('{sudo} /usr/bin/hdp-select set all `ambari-python-wrap /usr/bin/hdp-select versions | grep ^{stack_version_unformatted} | tail -1`'),
             only_if=format('ls -d /usr/hdp/{stack_version_unformatted}*'),   # If any HDP version is installed