openstack/devstack
Code Issues Proposed changes

Directly use GetDistro instead of failing if $DISTRO is not set

Browse Source 
Change-Id: I81d73a767e1c7f5e83eb535b2e1645e6ab29f347
This commit is contained in:
Vincent Untz 2012-10-04 13:36:46 +02:00
parent 3cf1ffbcdd
commit 855c5875c7
1 changed files with 2 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
functions
View File

@ -1,7 +1,6 @@
# functions - Common functions used by DevStack components # functions - Common functions used by DevStack components
# #
# The following variables are assumed to be defined by certain functions: # The following variables are assumed to be defined by certain functions:
# ``DISTRO``
# ``ENABLED_SERVICES`` # ``ENABLED_SERVICES``
# ``EROR_ON_CLONE`` # ``EROR_ON_CLONE``
# ``FILES`` # ``FILES``
@ -107,7 +106,7 @@ function get_field() {
# - ``# 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.
# #
# Uses globals ``DISTRO``, ``ENABLED_SERVICES`` # Uses globals ``ENABLED_SERVICES``
# get_packages dir # get_packages dir
function get_packages() { function get_packages() {
local package_dir=$1 local package_dir=$1
@ -119,8 +118,7 @@ function get_packages() {
return 1 return 1
fi fi
if [[ -z "$DISTRO" ]]; then if [[ -z "$DISTRO" ]]; then
echo "No distro set in DISTRO" GetDistro
return 1
fi fi
for service in general ${ENABLED_SERVICES//,/ }; do for service in general ${ENABLED_SERVICES//,/ }; do
# Allow individual services to specify dependencies # Allow individual services to specify dependencies