[asterisk-commits] mjordan: testsuite/asterisk/trunk r2982 - /asterisk/trunk/lib/python/asterisk/

SVN commits to the Asterisk project asterisk-commits at lists.digium.com
Fri Jan 6 16:40:13 CST 2012


Author: mjordan
Date: Fri Jan  6 16:40:10 2012
New Revision: 2982

URL: http://svnview.digium.com/svn/testsuite?view=rev&rev=2982
Log:
Fix improper handling of return value from Asterisk instance that exits non-zero

Modified:
    asterisk/trunk/lib/python/asterisk/asterisk.py

Modified: asterisk/trunk/lib/python/asterisk/asterisk.py
URL: http://svnview.digium.com/svn/testsuite/asterisk/trunk/lib/python/asterisk/asterisk.py?view=diff&rev=2982&r1=2981&r2=2982
==============================================================================
--- asterisk/trunk/lib/python/asterisk/asterisk.py (original)
+++ asterisk/trunk/lib/python/asterisk/asterisk.py Fri Jan  6 16:40:10 2012
@@ -385,8 +385,8 @@
             pass
         try:
             res = process.wait()
-            if res != 0:
-                raise Exception("Exited non-zero: " % (res,))
+            if res != None and res != 0:
+                logger.warn("Exited non-zero [%d] while executing command %s" % (res, str(cmd)))
         except OSError:
             pass
         return output




More information about the asterisk-commits mailing list