Browse code

Merge "Remove general assumption in get_packages()"

Jenkins authored on 2013/10/17 06:13:51
Showing 2 changed files
... ...
@@ -264,7 +264,7 @@ function _get_package_dir() {
264 264
 # - ``# dist:DISTRO`` or ``dist:DISTRO1,DISTRO2`` limits the selection
265 265
 #   of the package to the distros listed.  The distro names are case insensitive.
266 266
 function get_packages() {
267
-    local services=$1
267
+    local services=$@
268 268
     local package_dir=$(_get_package_dir)
269 269
     local file_to_parse
270 270
     local service
... ...
@@ -276,7 +276,7 @@ function get_packages() {
276 276
     if [[ -z "$DISTRO" ]]; then
277 277
         GetDistro
278 278
     fi
279
-    for service in general ${services//,/ }; do
279
+    for service in ${services//,/ }; do
280 280
         # Allow individual services to specify dependencies
281 281
         if [[ -e ${package_dir}/${service} ]]; then
282 282
             file_to_parse="${file_to_parse} $service"
... ...
@@ -55,7 +55,7 @@ export_proxy_variables
55 55
 # ================
56 56
 
57 57
 # Install package requirements
58
-install_package $(get_packages $ENABLED_SERVICES)
58
+install_package $(get_packages general $ENABLED_SERVICES)
59 59
 
60 60
 if [[ -n "$SYSLOG" && "$SYSLOG" != "False" ]]; then
61 61
     if is_ubuntu || is_fedora; then