From 86878ca7de8c4b14da7e10a82b26905de80a6c98 Mon Sep 17 00:00:00 2001 From: Michael Vogt Date: Fri, 9 Dec 2005 20:40:55 +0000 Subject: * CdromProgress.totalSteps added --- python/cdrom.cc | 6 ++---- python/progress.cc | 4 ++++ 2 files changed, 6 insertions(+), 4 deletions(-) (limited to 'python') 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(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); } -- cgit v1.2.3