Skip to content

Commit 20cfd67

Browse files
Jenkinsopenstack-gerrit
authored andcommitted
Merge "Fix multiple distro dependency bug"
2 parents 0ad9920 + 3ea1112 commit 20cfd67

File tree

1 file changed

+7
-7
lines changed

1 file changed

+7
-7
lines changed

stack.sh

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -626,13 +626,13 @@ function get_packages() {
626626
continue
627627
fi
628628

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
636636
fi
637637

638638
echo ${line%#*}

0 commit comments

Comments
 (0)