You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ambari.apache.org by jo...@apache.org on 2017/11/28 21:46:21 UTC

ambari git commit: AMBARI-22536 - Remove Deprecated Non-Versioned LZO Packages from LZO Install (jonathanhurley)

Repository: ambari
Updated Branches:
  refs/heads/branch-2.6 c43673f69 -> cd4db8e9a


AMBARI-22536 - Remove Deprecated Non-Versioned LZO Packages from LZO Install (jonathanhurley)


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

Branch: refs/heads/branch-2.6
Commit: cd4db8e9ac0ea7ce14fc1253959a121688f34952
Parents: c43673f
Author: Jonathan Hurley <jh...@hortonworks.com>
Authored: Tue Nov 28 16:22:00 2017 -0500
Committer: Jonathan Hurley <jh...@hortonworks.com>
Committed: Tue Nov 28 16:22:00 2017 -0500

----------------------------------------------------------------------
 .../resource_management/libraries/functions/lzo_utils.py       | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/ambari/blob/cd4db8e9/ambari-common/src/main/python/resource_management/libraries/functions/lzo_utils.py
----------------------------------------------------------------------
diff --git a/ambari-common/src/main/python/resource_management/libraries/functions/lzo_utils.py b/ambari-common/src/main/python/resource_management/libraries/functions/lzo_utils.py
index d6d987f..68ee607 100644
--- a/ambari-common/src/main/python/resource_management/libraries/functions/lzo_utils.py
+++ b/ambari-common/src/main/python/resource_management/libraries/functions/lzo_utils.py
@@ -36,9 +36,9 @@ def get_lzo_packages():
   lzo_packages = []
   script_instance = Script.get_instance()
   if OSCheck.is_suse_family() and int(OSCheck.get_os_major_version()) >= 12:
-    lzo_packages += ["liblzo2-2", "hadoop-lzo-native"]
+    lzo_packages += ["liblzo2-2"]
   elif OSCheck.is_redhat_family() or OSCheck.is_suse_family():
-    lzo_packages += ["lzo", "hadoop-lzo-native"]
+    lzo_packages += ["lzo"]
   elif OSCheck.is_ubuntu_family():
     lzo_packages += ["liblzo2-2"]
 
@@ -51,8 +51,6 @@ def get_lzo_packages():
     else:
       lzo_packages += [script_instance.format_package_name("hadooplzo_${stack_version}"),
                        script_instance.format_package_name("hadooplzo_${stack_version}-native")]
-  else:
-    lzo_packages += ["hadoop-lzo"]
 
   return lzo_packages