openstack/devstack
Code Issues Proposed changes

Merge "Handle the case of pipe char in value for iniset"

Browse Source
This commit is contained in:
Jenkins 2013-12-14 14:44:33 +00:00 committed by Gerrit Code Review
commit 998cc16a8d
2 changed files with 22 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
functions
View File

@ -741,8 +741,9 @@ function iniset() {
$option = $value $option = $value
" "$file" " "$file"
else else
local sep=$(echo -ne "\x01")
# Replace it # Replace it
sed -i -e "/^\[$section\]/,/^\[.*\]/ s|^\($option[ \t]*=[ \t]*\).*$|\1$value|" "$file" sed -i -e '/^\['${section}'\]/,/^\[.*\]/ s'${sep}'^\('${option}'[ \t]*=[ \t]*\).*$'${sep}'\1'"${value}"${sep} "$file"
fi fi
} }

20
tests/test_ini.sh
View File

@ -136,6 +136,26 @@ else
echo "iniget failed: $VAL" echo "iniget failed: $VAL"
fi fi
# test pipe in option
iniset test.ini aaa handlers "a|b"
VAL=$(iniget test.ini aaa handlers)
if [[ "$VAL" == "a|b" ]]; then
echo "OK: $VAL"
else
echo "iniget failed: $VAL"
fi
# test space in option
iniset test.ini aaa handlers "a b"
VAL="$(iniget test.ini aaa handlers)"
if [[ "$VAL" == "a b" ]]; then
echo "OK: $VAL"
else
echo "iniget failed: $VAL"
fi
# Test section not exist # Test section not exist
VAL=$(iniget test.ini zzz handlers) VAL=$(iniget test.ini zzz handlers)