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/a873684b Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/a873684b Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/a873684b Branch: refs/heads/branch-feature-AMBARI-21674 Commit: a873684b829e60352b47df003cbf217e10712c6d Parents: da8f54e Author: Jonathan Hurley <[email protected]> Authored: Tue Nov 28 16:22:00 2017 -0500 Committer: Jonathan Hurley <[email protected]> Committed: Fri Dec 1 09:05:08 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/a873684b/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
