Browse code

Merge "Fix multiple distro dependency bug"

Jenkins authored on 2012/06/14 07:03:50
Showing 1 changed files
... ...
@@ -626,13 +626,13 @@ function get_packages() {
626 626
                 continue
627 627
             fi
628 628
 
629
-            if [[ $line =~ (.*)#.*dist:([^ ]*) ]]; then # We are using BASH regexp matching feature.
630
-                        package=${BASH_REMATCH[1]}
631
-                        distros=${BASH_REMATCH[2]}
632
-                        for distro in ${distros//,/ }; do  #In bash ${VAR,,} will lowecase VAR
633
-                            [[ ${distro,,} == ${DISTRO,,} ]] && echo $package
634
-                        done
635
-                        continue
629
+            if [[ $line =~ (.*)#.*dist:([^ ]*) ]]; then
630
+                # We are using BASH regexp matching feature.
631
+                package=${BASH_REMATCH[1]}
632
+                distros=${BASH_REMATCH[2]}
633
+                # In bash ${VAR,,} will lowecase VAR
634
+                [[ ${distros,,} =~ ${DISTRO,,} ]] && echo $package
635
+                continue
636 636
             fi
637 637
 
638 638
             echo ${line%#*}