Repository: ambari Updated Branches: refs/heads/branch-2.5 7b980928e -> ddaa5be40 refs/heads/trunk 79d743b9d -> d3666b3ac
AMBARI-19186. RU install_packages fails on suse (dgrinenko via dlysnichenko) Project: http://git-wip-us.apache.org/repos/asf/ambari/repo Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/d3666b3a Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/d3666b3a Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/d3666b3a Branch: refs/heads/trunk Commit: d3666b3ac0942b01e99526dea73bb7c799308bfe Parents: 79d743b Author: Lisnichenko Dmitro <[email protected]> Authored: Tue Dec 13 12:52:16 2016 +0200 Committer: Lisnichenko Dmitro <[email protected]> Committed: Tue Dec 13 12:52:16 2016 +0200 ---------------------------------------------------------------------- .../src/test/python/resource_management/TestPackagesAnalyzer.py | 1 - .../resource_management/libraries/functions/packages_analyzer.py | 4 ++-- 2 files changed, 2 insertions(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ambari/blob/d3666b3a/ambari-agent/src/test/python/resource_management/TestPackagesAnalyzer.py ---------------------------------------------------------------------- diff --git a/ambari-agent/src/test/python/resource_management/TestPackagesAnalyzer.py b/ambari-agent/src/test/python/resource_management/TestPackagesAnalyzer.py index 36dfdd0..f898919 100644 --- a/ambari-agent/src/test/python/resource_management/TestPackagesAnalyzer.py +++ b/ambari-agent/src/test/python/resource_management/TestPackagesAnalyzer.py @@ -73,7 +73,6 @@ class TestPackagesAnalyzer(TestCase): checked_call_mock.return_value = (0, test_case["cheked_call_result"]) self.assertFalse(packages_analyzer.verifyDependencies(), "test_verify_dependency failed on '%s'" % test_case["name"]) - # try: in_family_patch_mock.side_effect = lambda current_family, family: False packages_analyzer.verifyDependencies() http://git-wip-us.apache.org/repos/asf/ambari/blob/d3666b3a/ambari-common/src/main/python/resource_management/libraries/functions/packages_analyzer.py ---------------------------------------------------------------------- diff --git a/ambari-common/src/main/python/resource_management/libraries/functions/packages_analyzer.py b/ambari-common/src/main/python/resource_management/libraries/functions/packages_analyzer.py index 52c46ed..9df2b64 100644 --- a/ambari-common/src/main/python/resource_management/libraries/functions/packages_analyzer.py +++ b/ambari-common/src/main/python/resource_management/libraries/functions/packages_analyzer.py @@ -95,7 +95,7 @@ def allInstalledPackages(allInstalledPackages): if OSCheck.is_suse_family(): return _lookUpZypperPackages( - ["sudo", "zypper", "search", "--installed-only", "--details"], + ["sudo", "zypper", "--no-gpg-checks", "search", "--installed-only", "--details"], allInstalledPackages) elif OSCheck.is_redhat_family(): return _lookUpYumPackages( @@ -113,7 +113,7 @@ def allAvailablePackages(allAvailablePackages): if OSCheck.is_suse_family(): return _lookUpZypperPackages( - ["sudo", "zypper", "search", "--uninstalled-only", "--details"], + ["sudo", "zypper", "--no-gpg-checks", "search", "--uninstalled-only", "--details"], allAvailablePackages) elif OSCheck.is_redhat_family(): return _lookUpYumPackages(
