From 4bbf76cfa7a42b0cccd650baf3508cf6cfb14c5a Mon Sep 17 00:00:00 2001
From: Michael Vogt <michael.vogt@ubuntu.com>
Date: Tue, 29 Mar 2011 09:07:52 +0200
Subject: PyFetchProgress::Pulse(): When ignoring a false return value from
 PyArg_Parse() after running the simple callback pulse(), there can be an
 exception on the stack, which must be cleared.  (LP: #711225)

---
 python/progress.cc | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

(limited to 'python')

diff --git a/python/progress.cc b/python/progress.cc
index 437309cf..5700a1b6 100644
--- a/python/progress.cc
+++ b/python/progress.cc
@@ -399,7 +399,9 @@ bool PyFetchProgress::Pulse(pkgAcquire * Owner)
    {
       // most of the time the user who subclasses the pulse()
       // method forgot to add a return {True,False} so we just
-      // assume he wants a True
+      // assume he wants a True.  There may be a Python exception on the stack
+      // that must be cleared.
+      PyErr_Clear();
       PyCbObj_BEGIN_ALLOW_THREADS
       return true;
    }
-- 
cgit v1.2.3