openstack
/
trove-integration
Code Issues Proposed changes

Do not pass apt-related variables to dnf 

Since the redstack script now supports Fedora, adding the necessary
checks in place so dnf does not receive apt variables.

Change-Id: I79cc2c72e0dfd738c5bb83604fffa101f4821a0b
Closes-bug: #1492484
This commit is contained in:
Juan Manuel Santos 2016-01-15 17:25:31 -03:00
parent 3aa6d63f06
commit 9baa084a93
1 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
scripts/redstack
View File

@ -114,12 +114,16 @@ fi
# set up respective package managers
if is_fedora; then
PKG_INSTALL_OPTS=""
PKG_MGR=dnf
PKG_GET_ARGS="-y"
else
PKG_INSTALL_OPTS="DEBIAN_FRONTEND=noninteractive"
PKG_MGR=apt-get
PKG_GET_ARGS="-y --allow-unauthenticated --force-yes"
fi
PKG_INSTALL_ARG="install"
PKG_UPDATE_ARG="update"
###############################################################################
# Utility functions
@ -160,12 +164,12 @@ function set_trove_plugin_vars () {
function pkg_install () {
echo Installing $@...
sudo -E DEBIAN_FRONTEND=noninteractive $HTTP_PROXY $PKG_MGR $PKG_GET_ARGS install $@
sudo -E $PKG_INSTALL_OPTS $HTTP_PROXY $PKG_MGR $PKG_GET_ARGS $PKG_INSTALL_ARG $@
}
function pkg_update () {
echo Updating $@...
sudo -E DEBIAN_FRONTEND=noninteractive $HTTP_PROXY $PKG_MGR $PKG_GET_ARGS update $@
sudo -E $PKG_INSTALL_OPTS $HTTP_PROXY $PKG_MGR $PKG_GET_ARGS $PKG_UPDATE_ARG $@
}
function set_home_dir() {