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 2014/07/07 17:46:52 UTC
git commit: AMBARI-6399. Don't use --force-yes for Ubuntu packages
(dlysnichenko)
Repository: ambari
Updated Branches:
refs/heads/trunk 931f8aed2 -> 19392c5a4
AMBARI-6399. Don't use --force-yes for Ubuntu packages (dlysnichenko)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/19392c5a
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/19392c5a
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/19392c5a
Branch: refs/heads/trunk
Commit: 19392c5a46436c1bdc49bdc804c24c5bde8f5a63
Parents: 931f8ae
Author: Lisnichenko Dmitro <dl...@hortonworks.com>
Authored: Mon Jul 7 18:44:55 2014 +0300
Committer: Lisnichenko Dmitro <dl...@hortonworks.com>
Committed: Mon Jul 7 18:45:38 2014 +0300
----------------------------------------------------------------------
.../core/providers/package/apt.py | 2 +-
.../resource_management/TestPackageResource.py | 16 ++++++++--------
ambari-server/src/main/python/setupAgent.py | 2 +-
.../src/main/resources/scripts/kerberos-setup.sh | 2 +-
4 files changed, 11 insertions(+), 11 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ambari/blob/19392c5a/ambari-agent/src/main/python/resource_management/core/providers/package/apt.py
----------------------------------------------------------------------
diff --git a/ambari-agent/src/main/python/resource_management/core/providers/package/apt.py b/ambari-agent/src/main/python/resource_management/core/providers/package/apt.py
index 0e9177c..03d27df 100644
--- a/ambari-agent/src/main/python/resource_management/core/providers/package/apt.py
+++ b/ambari-agent/src/main/python/resource_management/core/providers/package/apt.py
@@ -23,7 +23,7 @@ from resource_management.core.providers.package import PackageProvider
from resource_management.core import shell
from resource_management.core.logger import Logger
-INSTALL_CMD = "env DEBIAN_FRONTEND=noninteractive /usr/bin/apt-get -q -o Dpkg::Options::='--force-confdef' --force-yes --assume-yes install %s"
+INSTALL_CMD = "env DEBIAN_FRONTEND=noninteractive /usr/bin/apt-get -q -o Dpkg::Options::='--force-confdef' --allow-unauthenticated --assume-yes install %s"
REMOVE_CMD = "/usr/bin/apt-get -y -q remove %s"
CHECK_CMD = "dpkg --get-selections %s | grep -v deinstall"
http://git-wip-us.apache.org/repos/asf/ambari/blob/19392c5a/ambari-agent/src/test/python/resource_management/TestPackageResource.py
----------------------------------------------------------------------
diff --git a/ambari-agent/src/test/python/resource_management/TestPackageResource.py b/ambari-agent/src/test/python/resource_management/TestPackageResource.py
index cc9a1d7..08c7ac3 100644
--- a/ambari-agent/src/test/python/resource_management/TestPackageResource.py
+++ b/ambari-agent/src/test/python/resource_management/TestPackageResource.py
@@ -26,7 +26,7 @@ from resource_management.core.resources import Package
from resource_management.core import shell
class TestPackageResource(TestCase):
-
+
@patch.object(shell, "call")
@patch.object(shell, "checked_call")
@patch.object(System, "os_family", new = 'debian')
@@ -35,8 +35,8 @@ class TestPackageResource(TestCase):
with Environment('/') as env:
Package("some_package",
)
- call_mock.assert_called_with('dpkg --get-selections some_package | grep -v deinstall')
- shell_mock.assert_called_with("env DEBIAN_FRONTEND=noninteractive /usr/bin/apt-get -q -o Dpkg::Options::='--force-confdef' --force-yes --assume-yes install some_package")
+ call_mock.assert_called_with('dpkg --get-selections some_package | grep -v deinstall')
+ shell_mock.assert_called_with("env DEBIAN_FRONTEND=noninteractive /usr/bin/apt-get -q -o Dpkg::Options::='--force-confdef' --allow-unauthenticated --assume-yes install some_package")
@patch.object(shell, "call")
@@ -47,7 +47,7 @@ class TestPackageResource(TestCase):
with Environment('/') as env:
Package("some_package",
)
- call_mock.assert_called_with('rpm -q --quiet some_package')
+ call_mock.assert_called_with('rpm -q --quiet some_package')
shell_mock.assert_called_with("/usr/bin/yum -d 0 -e 0 -y install some_package")
@patch.object(shell, "call")
@@ -58,7 +58,7 @@ class TestPackageResource(TestCase):
with Environment('/') as env:
Package("some_package",
)
- call_mock.assert_called_with('rpm -q --quiet some_package')
+ call_mock.assert_called_with('rpm -q --quiet some_package')
shell_mock.assert_called_with("/usr/bin/zypper --quiet install --auto-agree-with-licenses --no-confirm some_package")
@patch.object(shell, "call", new = MagicMock(return_value=(0, None)))
@@ -86,7 +86,7 @@ class TestPackageResource(TestCase):
with Environment('/') as env:
Package("some_package",
action = "remove"
- )
+ )
shell_mock.assert_called_with("/usr/bin/yum -d 0 -e 0 -y erase some_package")
@patch.object(shell, "call", new = MagicMock(return_value=(0, None)))
@@ -96,7 +96,7 @@ class TestPackageResource(TestCase):
with Environment('/') as env:
Package("some_package",
action = "remove"
- )
+ )
shell_mock.assert_called_with("/usr/bin/zypper --quiet remove --no-confirm some_package")
@patch.object(shell, "call", new = MagicMock(return_value=(1, None)))
@@ -106,5 +106,5 @@ class TestPackageResource(TestCase):
with Environment('/') as env:
Package("some_package",
version = "3.5.0"
- )
+ )
shell_mock.assert_called_with("/usr/bin/yum -d 0 -e 0 -y install some_package-3.5.0")
http://git-wip-us.apache.org/repos/asf/ambari/blob/19392c5a/ambari-server/src/main/python/setupAgent.py
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/python/setupAgent.py b/ambari-server/src/main/python/setupAgent.py
index e83ed3f..7e5524d 100755
--- a/ambari-server/src/main/python/setupAgent.py
+++ b/ambari-server/src/main/python/setupAgent.py
@@ -48,7 +48,7 @@ def installAgent(projectVersion):
Command = ["zypper", "install", "-y", "ambari-agent-" + projectVersion]
elif OSCheck.is_debian_family():
# add * to end of version in case of some test releases
- Command = ["apt-get", "install", "-y", "--force-yes", "ambari-agent=" + projectVersion + "*"]
+ Command = ["apt-get", "install", "-y", "--allow-unauthenticated", "ambari-agent=" + projectVersion + "*"]
else:
Command = ["yum", "-y", "install", "--nogpgcheck", "ambari-agent-" + projectVersion]
return execOsCommand(Command)
http://git-wip-us.apache.org/repos/asf/ambari/blob/19392c5a/ambari-server/src/main/resources/scripts/kerberos-setup.sh
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/scripts/kerberos-setup.sh b/ambari-server/src/main/resources/scripts/kerberos-setup.sh
index 00f8076..4c1e40e 100755
--- a/ambari-server/src/main/resources/scripts/kerberos-setup.sh
+++ b/ambari-server/src/main/resources/scripts/kerberos-setup.sh
@@ -254,7 +254,7 @@ getEnvironmentCMD () {
case $os in
'debian12' )
pkgmgr='apt-get'
- inst_cmd="env DEBIAN_FRONTEND=noninteractive /usr/bin/$pkgmgr --force-yes --assume-yes install -f "
+ inst_cmd="env DEBIAN_FRONTEND=noninteractive /usr/bin/$pkgmgr --allow-unauthenticated --assume-yes install -f "
client_packages="krb5-user libpam-krb5 libpam-ccreds auth-client-config"
server_packages="krb5-kdc krb5-admin-server $client_packages"
rng_tools="rng-tools"