Fix update_upper_constraints removing additional ' ' char
In update_upper_constraints the sed substitution matches on a ' ' char after the UPPER_CONSTRAINTS_FILE consumes. This creates bad changes such as [1]. Compare the manual correction at [2]. [1] https://review.openstack.org/#/c/364973/1/tox.ini@17 [2] https://review.openstack.org/#/c/364973/1..2/tox.ini,unified Change-Id: I532150534813d23fbe9495c748ddef5e83be4739
This commit is contained in:
parent
77fcf9edd3
commit
948c8b942d
@ -81,7 +81,7 @@ function update_upper_constraints {
|
|||||||
|
|
||||||
echo "Updating tox.ini for upper-constraints"
|
echo "Updating tox.ini for upper-constraints"
|
||||||
git checkout $branch
|
git checkout $branch
|
||||||
sed -i~ -e "s,-c.*{\(env:UPPER_CONSTRAINTS_FILE\)[^ ]*} ,-c{\1:$uc_url}," tox.ini
|
sed -i~ -e "s,-c.*{\(env:UPPER_CONSTRAINTS_FILE\)[^ ]*},-c{\1:$uc_url}," tox.ini
|
||||||
if ! git diff --exit-code >/dev/null 2>&1 ; then
|
if ! git diff --exit-code >/dev/null 2>&1 ; then
|
||||||
git add tox.ini
|
git add tox.ini
|
||||||
git commit -m "Update UPPER_CONSTRAINTS_FILE for $branch"
|
git commit -m "Update UPPER_CONSTRAINTS_FILE for $branch"
|
||||||
|
Loading…
Reference in New Issue
Block a user