Merge remote-tracking branch 'mvo/feature/srcrec-enum' into debian/sid

Conflicts:
	debian/control

2 files changed, 26 insertions, 1 deletions

diff --git a/python/pkgsrcrecords.cc b/python/pkgsrcrecords.cc
index 6a60a9af..308299e2 100644
--- a/python/pkgsrcrecords.cc
+++ b/python/pkgsrcrecords.cc
@@ -75,10 +75,34 @@ static PyObject *PkgSrcRecordsRestart(PyObject *Self,PyObject *Args)
    return HandleErrors(Py_None);
 }
 
+static char *doc_PkgSrcRecordsStep =
+    "step() -> bool\n\n"
+    "Step to the next source package. Each call moves\n"
+    "the position of the records parser forward. If there are no\n"
+    "more records, return None. If the lookup failed this way,\n"
+    "access to any of the attributes will result in an AttributeError.";
+static PyObject *PkgSrcRecordsStep(PyObject *Self,PyObject *Args)
+{
+   PkgSrcRecordsStruct &Struct = GetCpp<PkgSrcRecordsStruct>(Self);
+
+   if (PyArg_ParseTuple(Args,"") == 0)
+      return 0;
+
+   Struct.Last = (pkgSrcRecords::Parser*)Struct.Records->Next();
+   if (Struct.Last == 0) {
+      Struct.Records->Restart();
+      Py_INCREF(Py_None);
+      return HandleErrors(Py_None);
+   }
+
+   return PyBool_FromLong(1);
+}
+
 static PyMethodDef PkgSrcRecordsMethods[] =
 {
    {"lookup",PkgSrcRecordsLookup,METH_VARARGS,doc_PkgSrcRecordsLookup},
    {"restart",PkgSrcRecordsRestart,METH_VARARGS,doc_PkgSrcRecordsRestart},
+   {"step",PkgSrcRecordsStep,METH_VARARGS,doc_PkgSrcRecordsStep},
    {}
 };
 
diff --git a/python/tag.cc b/python/tag.cc
index 50786cee..bab7811e 100644
--- a/python/tag.cc
+++ b/python/tag.cc
@@ -290,6 +290,8 @@ static PyObject *TagSecStr(PyObject *Self)
    const char *Start;
    const char *Stop;
    GetCpp<pkgTagSection>(Self).GetSection(Start,Stop);
+   printf("%x\n", &GetCpp<pkgTagSection>(Self));
+   std::cerr << Start << std::endl;
    return TagSecString_FromStringAndSize(Self,Start,Stop-Start);
 }
 									/*}}}*/
@@ -488,7 +490,6 @@ static PyObject *TagFileNew(PyTypeObject *type,PyObject *Args,PyObject *kwds)
    New->Section = (TagSecData*)(&PyTagSection_Type)->tp_alloc(&PyTagSection_Type, 0);
    new (&New->Section->Object) pkgTagSection();
    New->Section->Owner = New;
-   Py_INCREF(New->Section->Owner);
    New->Section->Data = 0;
    New->Section->Bytes = Bytes;
 #if PY_MAJOR_VERSION >= 3