openstack/devstack
Code Issues Proposed changes

Remove general assumption in get_packages()

Browse Source 
get_packages() always included 'general' as a default 'service' file.
Remove this assumption and add it explicitly to the primary package
installation call.  This allows get_package() to be used in other places
where 'general' is not desired to be included.

Change-Id: I1eed4386d073d6ae9534aedae32654208c6662e8
This commit is contained in:
Dean Troyer 2013-10-04 13:33:07 -05:00
parent af2b982842
commit ca5af8615e
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
functions
View File

@ -248,7 +248,7 @@ function _get_package_dir() {
# - ``# dist:DISTRO`` or ``dist:DISTRO1,DISTRO2`` limits the selection # - ``# dist:DISTRO`` or ``dist:DISTRO1,DISTRO2`` limits the selection
# of the package to the distros listed. The distro names are case insensitive. # of the package to the distros listed. The distro names are case insensitive.
function get_packages() { function get_packages() {
local services=$1 local services=$@
local package_dir=$(_get_package_dir) local package_dir=$(_get_package_dir)
local file_to_parse local file_to_parse
local service local service
@ -260,7 +260,7 @@ function get_packages() {
if [[ -z "$DISTRO" ]]; then if [[ -z "$DISTRO" ]]; then
GetDistro GetDistro
fi fi
for service in general ${services//,/ }; do for service in ${services//,/ }; do
# Allow individual services to specify dependencies # Allow individual services to specify dependencies
if [[ -e ${package_dir}/${service} ]]; then if [[ -e ${package_dir}/${service} ]]; then
file_to_parse="${file_to_parse} $service" file_to_parse="${file_to_parse} $service"

2
tools/install_prereqs.sh
View File

@ -55,7 +55,7 @@ export_proxy_variables
# ================ # ================
# Install package requirements # Install package requirements
install_package $(get_packages $ENABLED_SERVICES) install_package $(get_packages general $ENABLED_SERVICES)
if [[ -n "$SYSLOG" && "$SYSLOG" != "False" ]]; then if [[ -n "$SYSLOG" && "$SYSLOG" != "False" ]]; then
if is_ubuntu || is_fedora; then if is_ubuntu || is_fedora; then