From 8813f21332aa9ce959a043458429fa426ee209c8 Mon Sep 17 00:00:00 2001 From: Clark Boylan Date: Fri, 17 Mar 2017 08:39:26 -0700 Subject: [PATCH] Handle trailing commas in source libs list Some job defs (like ironics) have trailing commas in their DEVSTACK_LIB_FROM_GIT list which was not parsed properly by the new PROJECTS code. Chomp the trailing comma with sed so that we don't have problems with it. Change-Id: I70bd1737158efe351f85ae899e795b191029e090 --- devstack-vm-gate-wrap.sh | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/devstack-vm-gate-wrap.sh b/devstack-vm-gate-wrap.sh index 69e397d1..636b5d0e 100755 --- a/devstack-vm-gate-wrap.sh +++ b/devstack-vm-gate-wrap.sh @@ -145,7 +145,8 @@ fi if [[ -n "$DEVSTACK_PROJECT_FROM_GIT" ]] ; then # We populate the PROJECTS list with any libs that should be installed # from source and not pypi assuming that live under openstack/ - PROCESSED_FROM_GIT=$(echo "openstack/$DEVSTACK_PROJECT_FROM_GIT" | sed -e 's/,/ openstack\//g') + TRAILING_COMMA_REMOVED=$(echo "$DEVSTACK_PROJECT_FROM_GIT" | sed -e 's/,$//') + PROCESSED_FROM_GIT=$(echo "openstack/$TRAILING_COMMA_REMOVED" | sed -e 's/,/ openstack\//g') PROJECTS="$PROCESSED_FROM_GIT $PROJECTS" fi