openstack/devstack
Code Issues Proposed changes

ini-config : always reenable xtrace on return

Browse Source 
These return paths doesn't renable xtrace, so output mysteriously goes
missing until the next time it is enabled.

Change-Id: I3a8018dfa9397c07534970c39fba8dc10afcbe41
This commit is contained in:
Ian Wienand 2015-07-22 12:16:45 +10:00
parent b5c3724388
commit 92884ede5d
1 changed files with 12 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
inc/ini-config
View File

@ -104,7 +104,10 @@ function iniadd_literal {
local option=$3 local option=$3
local value=$4 local value=$4
[[ -z $section || -z $option ]] && return if [[ -z $section || -z $option ]]; then
$xtrace
return
fi
# Add it # Add it
sed -i -e "/^\[$section\]/ a\\ sed -i -e "/^\[$section\]/ a\\
@ -123,7 +126,10 @@ function inidelete {
local section=$2 local section=$2
local option=$3 local option=$3
[[ -z $section || -z $option ]] && return if [[ -z $section || -z $option ]]; then
$xtrace
return
fi
# Remove old values # Remove old values
sed -i -e "/^\[$section\]/,/^\[.*\]/ { /^$option[ \t]*=/ d; }" "$file" sed -i -e "/^\[$section\]/,/^\[.*\]/ { /^$option[ \t]*=/ d; }" "$file"
@ -141,7 +147,10 @@ function iniset {
local option=$3 local option=$3
local value=$4 local value=$4
[[ -z $section || -z $option ]] && return if [[ -z $section || -z $option ]]; then
$xtrace
return
fi
if ! grep -q "^\[$section\]" "$file" 2>/dev/null; then if ! grep -q "^\[$section\]" "$file" 2>/dev/null; then
# Add section at the end # Add section at the end