You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ambari.apache.org by dm...@apache.org on 2016/12/13 10:55:32 UTC
[2/2] ambari git commit: AMBARI-19186. RU install_packages fails on
suse (dgrinenko via dlysnichenko)
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/ddaa5be4
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/ddaa5be4
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/ddaa5be4
Branch: refs/heads/branch-2.5
Commit: ddaa5be40965768283e7a7e4f57db5646389bce1
Parents: 7b98092
Author: Lisnichenko Dmitro <dl...@hortonworks.com>
Authored: Tue Dec 13 12:52:16 2016 +0200
Committer: Lisnichenko Dmitro <dl...@hortonworks.com>
Committed: Tue Dec 13 12:54:37 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/ddaa5be4/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/ddaa5be4/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(