summaryrefslogtreecommitdiff
path: root/python/progress.cc
diff options
context:
space:
mode:
authorMichael Vogt <michael.vogt@ubuntu.com>2010-07-28 11:09:00 +0200
committerMichael Vogt <michael.vogt@ubuntu.com>2010-07-28 11:09:00 +0200
commitcee5d33d44130ce8ceb7b563f7b97f2bf9a3ca5c (patch)
tree8157a049457a566f6ac5b2e665cba01629aadd58 /python/progress.cc
parent3b4330920da718d2dbb2a4a94577c07eaa58a8c5 (diff)
parentd642c9ea22f5705acfcba79493f48293626771c3 (diff)
downloadpython-apt-cee5d33d44130ce8ceb7b563f7b97f2bf9a3ca5c.tar.gz
merged from the debian-sid bzr branch
Diffstat (limited to 'python/progress.cc')
-rw-r--r--python/progress.cc5
1 files changed, 4 insertions, 1 deletions
diff --git a/python/progress.cc b/python/progress.cc
index 9002b3eb..437309cf 100644
--- a/python/progress.cc
+++ b/python/progress.cc
@@ -300,7 +300,10 @@ bool PyFetchProgress::Pulse(pkgAcquire * Owner)
Py_INCREF(pyAcquire);
if (RunSimpleCallback("pulse", TUPLEIZE(pyAcquire) , &result1)) {
- if (result1 != NULL && PyArg_Parse(result1, "b", &res1) && res1 == false) {
+ if (result1 != NULL &&
+ result1 != Py_None &&
+ PyArg_Parse(result1, "b", &res1) &&
+ res1 == false) {
// the user returned a explicit false here, stop
PyCbObj_BEGIN_ALLOW_THREADS
return false;