* added Cdrom.Ident(), improved the examples

2 files changed, 17 insertions, 5 deletions

diff --git a/doc/examples/cdrom.py b/doc/examples/cdrom.py
index e1873093..bf044d7c 100644
--- a/doc/examples/cdrom.py
+++ b/doc/examples/cdrom.py
@@ -15,10 +15,15 @@ cdrom = apt_pkg.GetCdrom()
 print cdrom
 
 progress = CdromProgress()
-apt_pkg.Config.Set("APT::CDROM::Rename", "True")
 
+(res,ident) = cdrom.Ident(progress)
+print "ident result is: %s (%s) " % (res, ident)
+
+apt_pkg.Config.Set("APT::CDROM::Rename", "True")
 cdrom.Add(progress)
 
+
+
 print "Exiting"
 sys.exit(0)
 
diff --git a/python/cdrom.cc b/python/cdrom.cc
index 764110ce..13889b31 100644
--- a/python/cdrom.cc
+++ b/python/cdrom.cc
@@ -40,13 +40,20 @@ static PyObject *PkgCdromIdent(PyObject *Self,PyObject *Args)
 {   
    PkgCdromStruct &Struct = GetCpp<PkgCdromStruct>(Self);
 
-   if (PyArg_ParseTuple(Args,"") == 0)
+   PyObject *pyCdromProgressInst = 0;
+   if (PyArg_ParseTuple(Args, "O", &pyCdromProgressInst) == 0) {
       return 0;
+   }
 
-   //pkgFixBroken(*Struct.depcache);
+   PyCdromProgress progress;
+   progress.setCallbackInst(pyCdromProgressInst);
 
-   Py_INCREF(Py_None);
-   return HandleErrors(Py_None);   
+   string ident;
+   bool res = Struct.cdrom.Ident(ident, &progress);
+
+   PyObject *result = Py_BuildValue("(bs)", res, ident.c_str());
+
+   return HandleErrors(result);   
 }