From 855c5875c7756db192fe7078bed207ab280f7780 Mon Sep 17 00:00:00 2001
From: Vincent Untz <vuntz@suse.com>
Date: Thu, 4 Oct 2012 13:36:46 +0200
Subject: [PATCH] Directly use GetDistro instead of failing if $DISTRO is not
 set

Change-Id: I81d73a767e1c7f5e83eb535b2e1645e6ab29f347
---
 functions | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/functions b/functions
index 677621f2f5..0d0df51fad 100644
--- a/functions
+++ b/functions
@@ -1,7 +1,6 @@
 # functions - Common functions used by DevStack components
 #
 # The following variables are assumed to be defined by certain functions:
-# ``DISTRO``
 # ``ENABLED_SERVICES``
 # ``EROR_ON_CLONE``
 # ``FILES``
@@ -107,7 +106,7 @@ function get_field() {
 # - ``# dist:DISTRO`` or ``dist:DISTRO1,DISTRO2`` limits the selection
 #   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
 function get_packages() {
     local package_dir=$1
@@ -119,8 +118,7 @@ function get_packages() {
         return 1
     fi
     if [[ -z "$DISTRO" ]]; then
-        echo "No distro set in DISTRO"
-        return 1
+        GetDistro
     fi
     for service in general ${ENABLED_SERVICES//,/ }; do
         # Allow individual services to specify dependencies