* [gentoo-commits] portage r14215 - main/trunk/bin
@ 2009-09-08 1:51 Zac Medico (zmedico)
0 siblings, 0 replies; only message in thread
From: Zac Medico (zmedico) @ 2009-09-08 1:51 UTC (permalink / raw
To: gentoo-commits
Author: zmedico
Date: 2009-09-08 01:51:26 +0000 (Tue, 08 Sep 2009)
New Revision: 14215
Modified:
main/trunk/bin/misc-functions.sh
Log:
Fix code from previous commit so it's guaranteed to always properly reset
debug state.
Modified: main/trunk/bin/misc-functions.sh
===================================================================
--- main/trunk/bin/misc-functions.sh 2009-09-08 01:44:24 UTC (rev 14214)
+++ main/trunk/bin/misc-functions.sh 2009-09-08 01:51:26 UTC (rev 14215)
@@ -410,7 +410,11 @@
if [[ -n ${PORTAGE_LOG_FILE} && -r ${PORTAGE_LOG_FILE} ]] ; then
# In debug mode, this variable definition will produce
# a false positive if it's shown in the trace.
- [[ $PORTAGE_DEBUG = 1 ]] && set +x
+ local reset_debug=0
+ if [[ ${-/x/} != $- ]] ; then
+ set +x
+ reset_debug=1
+ fi
local m msgs=(
": warning: dereferencing type-punned pointer will break strict-aliasing rules$"
": warning: dereferencing pointer .* does break strict-aliasing rules$"
@@ -420,7 +424,7 @@
": warning: comparisons like X<=Y<=Z do not have their mathematical meaning$"
": warning: null argument where non-null required "
)
- [[ $PORTAGE_DEBUG = 1 ]] && set -x
+ [[ $reset_debug = 1 ]] && set -x
abort="no"
i=0
while [[ -n ${msgs[${i}]} ]] ; do
^ permalink raw reply [flat|nested] only message in thread
only message in thread, other threads:[~2009-09-08 1:51 UTC | newest]
Thread overview: (only message) (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2009-09-08 1:51 [gentoo-commits] portage r14215 - main/trunk/bin Zac Medico (zmedico)
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox