summaryrefslogtreecommitdiff
path: root/python
diff options
context:
space:
mode:
authorMichael Vogt <michael.vogt@ubuntu.com>2005-12-09 20:40:55 +0000
committerMichael Vogt <michael.vogt@ubuntu.com>2005-12-09 20:40:55 +0000
commit86878ca7de8c4b14da7e10a82b26905de80a6c98 (patch)
treeb10ea73051cbfc00d21a8f7c7e40a72e493d88fe /python
parenta7073554674b0e9aaf262e4d981fbbb20713ac4a (diff)
downloadpython-apt-86878ca7de8c4b14da7e10a82b26905de80a6c98.tar.gz
* CdromProgress.totalSteps added
Diffstat (limited to 'python')
-rw-r--r--python/cdrom.cc6
-rw-r--r--python/progress.cc4
2 files changed, 6 insertions, 4 deletions
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);
}