Handle nested xtrace states
The lib/database abstraction includes the appropriate database file that also contains the $XTRACE bits at entry and exit. The nested XTRACE handling overwrote the value from lib/database. So...make the nested files use their own XTRACE variables. Change-Id: Ibdfc8d7d1e1457a9bc889b781ce176b417789ea1
This commit is contained in:
parent
3b3a6d78a6
commit
41bf452023
@ -5,7 +5,7 @@
|
|||||||
# DATABASE_{HOST,USER,PASSWORD} must be defined
|
# DATABASE_{HOST,USER,PASSWORD} must be defined
|
||||||
|
|
||||||
# Save trace setting
|
# Save trace setting
|
||||||
XTRACE=$(set +o | grep xtrace)
|
MY_XTRACE=$(set +o | grep xtrace)
|
||||||
set +o xtrace
|
set +o xtrace
|
||||||
|
|
||||||
register_database mysql
|
register_database mysql
|
||||||
@ -121,4 +121,4 @@ function database_connection_url_mysql {
|
|||||||
}
|
}
|
||||||
|
|
||||||
# Restore xtrace
|
# Restore xtrace
|
||||||
$XTRACE
|
$MY_XTRACE
|
||||||
|
@ -5,7 +5,7 @@
|
|||||||
# DATABASE_{HOST,USER,PASSWORD} must be defined
|
# DATABASE_{HOST,USER,PASSWORD} must be defined
|
||||||
|
|
||||||
# Save trace setting
|
# Save trace setting
|
||||||
XTRACE=$(set +o | grep xtrace)
|
PG_XTRACE=$(set +o | grep xtrace)
|
||||||
set +o xtrace
|
set +o xtrace
|
||||||
|
|
||||||
register_database postgresql
|
register_database postgresql
|
||||||
@ -76,4 +76,4 @@ function database_connection_url_postgresql {
|
|||||||
}
|
}
|
||||||
|
|
||||||
# Restore xtrace
|
# Restore xtrace
|
||||||
$XTRACE
|
$PG_XTRACE
|
||||||
|
Loading…
Reference in New Issue
Block a user