Browse code
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
Dean Troyer authored on 2013/01/29 05:04:39Showing 2 changed files
| ... | ... |
@@ -5,7 +5,7 @@ |
| 5 | 5 |
# DATABASE_{HOST,USER,PASSWORD} must be defined
|
| 6 | 6 |
|
| 7 | 7 |
# Save trace setting |
| 8 |
-XTRACE=$(set +o | grep xtrace) |
|
| 8 |
+MY_XTRACE=$(set +o | grep xtrace) |
|
| 9 | 9 |
set +o xtrace |
| 10 | 10 |
|
| 11 | 11 |
register_database mysql |
| ... | ... |
@@ -121,4 +121,4 @@ function database_connection_url_mysql {
|
| 121 | 121 |
} |
| 122 | 122 |
|
| 123 | 123 |
# Restore xtrace |
| 124 |
-$XTRACE |
|
| 124 |
+$MY_XTRACE |
| ... | ... |
@@ -5,7 +5,7 @@ |
| 5 | 5 |
# DATABASE_{HOST,USER,PASSWORD} must be defined
|
| 6 | 6 |
|
| 7 | 7 |
# Save trace setting |
| 8 |
-XTRACE=$(set +o | grep xtrace) |
|
| 8 |
+PG_XTRACE=$(set +o | grep xtrace) |
|
| 9 | 9 |
set +o xtrace |
| 10 | 10 |
|
| 11 | 11 |
register_database postgresql |
| ... | ... |
@@ -76,4 +76,4 @@ function database_connection_url_postgresql {
|
| 76 | 76 |
} |
| 77 | 77 |
|
| 78 | 78 |
# Restore xtrace |
| 79 |
-$XTRACE |
|
| 79 |
+$PG_XTRACE |