openstack/devstack
Code Issues Proposed changes

Merge "Add contitional update package repositories to install_package()"

Browse Source
This commit is contained in:
Jenkins 2012-09-09 19:34:01 +00:00 committed by Gerrit Code Review
commit 08819d78a8
2 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
functions
View File

@ -536,7 +536,11 @@ function install_package() {
if [[ -z "$os_PACKAGE" ]]; then if [[ -z "$os_PACKAGE" ]]; then
GetOSVersion GetOSVersion
fi fi
if [[ "$os_PACKAGE" = "deb" ]]; then if [[ "$os_PACKAGE" = "deb" ]]; then
[[ "$NO_UPDATE_REPOS" = "True" ]] || apt_get update
NO_UPDATE_REPOS=True
apt_get install "$@" apt_get install "$@"
else else
yum_install "$@" yum_install "$@"

3
stack.sh
View File

@ -183,7 +183,7 @@ if [[ $EUID -eq 0 ]]; then
# Give the non-root user the ability to run as **root** via ``sudo`` # Give the non-root user the ability to run as **root** via ``sudo``
if [[ "$os_PACKAGE" = "deb" ]]; then if [[ "$os_PACKAGE" = "deb" ]]; then
dpkg -l sudo || apt_get update && install_package sudo dpkg -l sudo || install_package sudo
else else
rpm -qa | grep sudo || install_package sudo rpm -qa | grep sudo || install_package sudo
fi fi
@ -660,7 +660,6 @@ set -o xtrace
# Install package requirements # Install package requirements
if [[ "$os_PACKAGE" = "deb" ]]; then if [[ "$os_PACKAGE" = "deb" ]]; then
apt_get update
install_package $(get_packages $FILES/apts) install_package $(get_packages $FILES/apts)
else else
install_package $(get_packages $FILES/rpms) install_package $(get_packages $FILES/rpms)