ambari git commit: AMBARI-12151. RU: uses display name instead of actual hdp stack version (smohanty)

[sm...@apache.org]

Repository: ambari
Updated Branches:
  refs/heads/trunk f9cefa244 -> ce962b73d


AMBARI-12151. RU: uses display name instead of actual hdp stack version (smohanty)


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

Branch: refs/heads/trunk
Commit: ce962b73da6c9a46e47a2382b1e9f38a32832395
Parents: f9cefa2
Author: Sumit Mohanty <sm...@hortonworks.com>
Authored: Thu Jun 25 17:08:43 2015 -0700
Committer: Sumit Mohanty <sm...@hortonworks.com>
Committed: Thu Jun 25 17:08:43 2015 -0700

----------------------------------------------------------------------
 .../resources/custom_actions/scripts/install_packages.py     | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/ambari/blob/ce962b73/ambari-server/src/main/resources/custom_actions/scripts/install_packages.py
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/custom_actions/scripts/install_packages.py b/ambari-server/src/main/resources/custom_actions/scripts/install_packages.py
index 13b4163..0681afe 100644
--- a/ambari-server/src/main/resources/custom_actions/scripts/install_packages.py
+++ b/ambari-server/src/main/resources/custom_actions/scripts/install_packages.py
@@ -116,20 +116,20 @@ class InstallPackages(Script):
     if num_errors > 0:
       raise Fail("Failed to distribute repositories/install packages")
 
-    # If the repo doesn't contain a build number, then will need to calculate it after the packages are installed.
+    # If the repo contains a build number, optimistically assume it to be the actual_version. It will get changed
+    # to correct value if it is not
     self.actual_version = None
     if self.repository_version:
       m = re.search("[\d\.]+-\d+", self.repository_version)
       if m:
         # Contains a build number
-        self.actual_version = self.repository_version
-        self.structured_output['actual_version'] = self.actual_version
+        self.structured_output['actual_version'] = self.repository_version
         self.put_structured_out(self.structured_output)
 
     # Initial list of versions, used to compute the new version installed
     self.old_versions = []
     if self.actual_version is None:
-      Logger.info("Repository version {0} doesn't contain a build number. Will have to calculate the actual version.".format(self.repository_version))
+      Logger.info("Calculate the actual version.".format(self.repository_version))
       self.old_versions = self.hdp_versions()
 
     try: