[25681] in CVS-changelog-for-Kerberos-V5
svn rev #25171: trunk/src/util/
daemon@ATHENA.MIT.EDU (ghudson@mit.edu)
Sat Sep 10 18:58:58 2011
Date: Sat, 10 Sep 2011 18:58:55 -0400
From: ghudson@mit.edu
Message-Id: <201109102258.p8AMwtjN032342@drugstore.mit.edu>
To: cvs-krb5@mit.edu
Reply-To: krbdev@mit.edu
MIME-Version: 1.0
Content-Type: text/plain; charset="us-ascii"
Content-Transfer-Encoding: 7bit
Errors-To: cvs-krb5-bounces@mit.edu
http://src.mit.edu/fisheye/changelog/krb5/?cs=25171
Commit By: ghudson
Log Message:
Wait before killing daemons in interactive k5test.
If k5test is invoked with any stop, wait, or debug options, wait for
input before killing daemons, in case a daemon is being debugged.
Changed Files:
U trunk/src/util/k5test.py
Modified: trunk/src/util/k5test.py
===================================================================
--- trunk/src/util/k5test.py 2011-09-09 21:02:55 UTC (rev 25170)
+++ trunk/src/util/k5test.py 2011-09-10 22:58:55 UTC (rev 25171)
@@ -347,6 +347,7 @@
# prints messages to help developers debug the problem.
def _onexit():
global _daemons, _success, verbose
+ global _debug, _stop_before, _stop_after, _shell_before, _shell_after
if _daemons is None:
# In Python 2.5, if we exit as a side-effect of importing
# k5test, _onexit will execute in an empty global namespace.
@@ -355,6 +356,10 @@
# daemons have been launched and that we don't really need to
# amend the error message. The bug is fixed in Python 2.6.
return
+ if _debug or _stop_before or _stop_after or _shell_before or _shell_after:
+ # Wait before killing daemons in case one is being debugged.
+ sys.stdout.write('*** Press return to kill daemons and exit script: ')
+ sys.stdin.readline()
for proc in _daemons:
os.kill(proc.pid, signal.SIGTERM)
if not _success:
_______________________________________________
cvs-krb5 mailing list
cvs-krb5@mit.edu
https://mailman.mit.edu/mailman/listinfo/cvs-krb5
