summaryrefslogtreecommitdiff
path: root/python
diff options
context:
space:
mode:
authorMichael Vogt <michael.vogt@ubuntu.com>2010-07-12 14:55:55 +0200
committerMichael Vogt <michael.vogt@ubuntu.com>2010-07-12 14:55:55 +0200
commit008ba8e659c6aabe66496aab0bfbeb0bf92a9e30 (patch)
treef6b2ec1effefbed34de7e8a9ea01f5885f0cdd30 /python
parent4325749c7bfe5f1e83983415e13eafd84bb62907 (diff)
parent3b155e595fed78f8eac22de78106cd3dcad9793c (diff)
downloadpython-apt-008ba8e659c6aabe66496aab0bfbeb0bf92a9e30.tar.gz
merged from debian-sid, improve test output
Diffstat (limited to 'python')
-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;