* CdromProgress.totalSteps added

3 files changed, 7 insertions, 4 deletions

diff --git a/debian/changelog b/debian/changelog
index 5f4c0856..d8a8527a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -6,6 +6,7 @@ python-apt (0.6.16) unstable; urgency=low
   * rewrote apt.cache.update() to use the improved aquire interface
   * apt/ API change: apt.Package.candidateOrigin returns a list of origins 
     now instead of a single one
+  * apt_pkg.Cdrom.Add() returns a boolean now, CdromProgress has totalSteps
 
  -- Michael Vogt <michael.vogt@ubuntu.com>  Thu,  1 Dec 2005 14:01:39 +0100
 
diff --git a/python/cdrom.cc b/python/cdrom.cc
index 13889b31..aca1be26 100644
--- a/python/cdrom.cc
+++ b/python/cdrom.cc
@@ -30,10 +30,9 @@ static PyObject *PkgCdromAdd(PyObject *Self,PyObject *Args)
    PyCdromProgress progress;
    progress.setCallbackInst(pyCdromProgressInst);
 
-   Struct.cdrom.Add(&progress);
+   bool res = Struct.cdrom.Add(&progress);
 
-   Py_INCREF(Py_None);
-   return HandleErrors(Py_None);   
+   return HandleErrors(Py_BuildValue("b", res));   
 }
 
 static PyObject *PkgCdromIdent(PyObject *Self,PyObject *Args)
@@ -69,7 +68,6 @@ static PyObject *CdromAttr(PyObject *Self,char *Name)
 {
    PkgCdromStruct &Struct = GetCpp<PkgCdromStruct>(Self);
 
-   
    return Py_FindMethod(PkgCdromMethods,Self,Name);
 }
 
diff --git a/python/progress.cc b/python/progress.cc
index d0c97839..f00058c9 100644
--- a/python/progress.cc
+++ b/python/progress.cc
@@ -299,6 +299,10 @@ pkgPackageManager::OrderResult PyInstallProgress::Run(pkgPackageManager *pm)
 void PyCdromProgress::Update(string text, int current)
 {
    PyObject *arglist = Py_BuildValue("(si)", text.c_str(), current);
+
+   PyObject *o = Py_BuildValue("i", totalSteps);
+   PyObject_SetAttrString(callbackInst, "totalSteps", o);
+
    RunSimpleCallback("update", arglist);
 }