* python/progress.cc:

  - if the mediaChange() does not return anything or is not implemented
    send "false" to libapt
* 
* No change rebuild to fix misbuilt binaries on armel.
* rebuild against latest libapt

2 files changed, 25 insertions, 5 deletions

diff --git a/debian/changelog b/debian/changelog
index da7ae66f..b1faf76f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,24 @@
+python-apt (0.7.13.2ubuntu5) UNRELEASED; urgency=low
+
+  * python/progress.cc:
+    - if the mediaChange() does not return anything or is not implemented
+      send "false" to libapt
+  * 
+
+ -- Michael Vogt <michael.vogt@ubuntu.com>  Wed, 28 Oct 2009 19:09:44 +0100
+
+python-apt (0.7.13.2ubuntu4) karmic; urgency=low
+
+  * No change rebuild to fix misbuilt binaries on armel.
+
+ -- Loïc Minier <loic.minier@ubuntu.com>  Wed, 21 Oct 2009 14:52:36 +0200
+
+python-apt (0.7.13.2ubuntu3) karmic; urgency=low
+
+  * rebuild against latest libapt
+
+ -- Michael Vogt <michael.vogt@ubuntu.com>  Fri, 25 Sep 2009 22:17:35 +0200
+
 python-apt (0.7.13.2ubuntu2) karmic; urgency=low
 
   [ Michael Vogt ]
diff --git a/python/progress.cc b/python/progress.cc
index b3e06b87..82967687 100644
--- a/python/progress.cc
+++ b/python/progress.cc
@@ -104,11 +104,10 @@ bool PyFetchProgress::MediaChange(string Media, string Drive)
    RunSimpleCallback("mediaChange", arglist, &result);
 
    bool res = true;
-   if(!PyArg_Parse(result, "b", &res))
-      std::cerr << "result could not be parsed" << std::endl;
-
-   // FIXME: find out what it should return usually
-   //std::cerr << "res is: " << res << std::endl;
+   if(!PyArg_Parse(result, "b", &res)) {
+      // no return value or None, assume false
+      return false;
+   }
 
    PyCbObj_BEGIN_ALLOW_THREADS
    return res;