Browse code

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

Change-Id: I81d73a767e1c7f5e83eb535b2e1645e6ab29f347

Vincent Untz authored on 2012/10/04 20:36:46
Showing 1 changed files
... ...
@@ -1,7 +1,6 @@
1 1
 # functions - Common functions used by DevStack components
2 2
 #
3 3
 # The following variables are assumed to be defined by certain functions:
4
-# ``DISTRO``
5 4
 # ``ENABLED_SERVICES``
6 5
 # ``EROR_ON_CLONE``
7 6
 # ``FILES``
... ...
@@ -107,7 +106,7 @@ function get_field() {
107 107
 # - ``# dist:DISTRO`` or ``dist:DISTRO1,DISTRO2`` limits the selection
108 108
 #   of the package to the distros listed.  The distro names are case insensitive.
109 109
 #
110
-# Uses globals ``DISTRO``, ``ENABLED_SERVICES``
110
+# Uses globals ``ENABLED_SERVICES``
111 111
 # get_packages dir
112 112
 function get_packages() {
113 113
     local package_dir=$1
... ...
@@ -119,8 +118,7 @@ function get_packages() {
119 119
         return 1
120 120
     fi
121 121
     if [[ -z "$DISTRO" ]]; then
122
-        echo "No distro set in DISTRO"
123
-        return 1
122
+        GetDistro
124 123
     fi
125 124
     for service in general ${ENABLED_SERVICES//,/ }; do
126 125
         # Allow individual services to specify dependencies