folkslinux
/
rpm
mirror of https://github.com/rpm-software-management/rpm.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Eliminate rpmdsNotify() from the API + Python bindings 

This is an internal helper for debug logging and should've never been
part of the API in the first place. We're removing all sorts of things
on this round anyway so it's a fine opportunity for removing this too.
It's not as if anybody used this outside rpm because it's ... not
exactly useful.
This commit is contained in:
Panu Matilainen 2017-03-28 16:16:01 +03:00
parent f30d96772e
commit 2652bab3e9
3 changed files with 9 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
lib/rpmds.h
View File

@ -313,15 +313,6 @@ rpm_color_t rpmdsColor(const rpmds ds);
*/
rpm_color_t rpmdsSetColor(const rpmds ds, rpm_color_t color);
/** \ingroup rpmds
* Notify of results of dependency match.
* @param ds dependency set
* @param where where dependency was resolved (or NULL)
* @param rc 0 == YES, otherwise NO
*/
/* FIX: rpmMessage annotation is a lie */
void rpmdsNotify(rpmds ds, const char * where, int rc);
/** \ingroup rpmds
* Return next dependency set iterator index.
* @param ds dependency set

9
lib/rpmds_internal.h
View File

@ -21,6 +21,15 @@ RPM_GNUC_INTERNAL
int rpmdsMatches(rpmstrPool pool, Header h, int prix,
rpmds req, int selfevr, int nopromote);
/** \ingroup rpmds
* Notify of results of dependency match.
* @param ds dependency set
* @param where where dependency was resolved (or NULL)
* @param rc 0 == YES, otherwise NO
*/
RPM_GNUC_INTERNAL
void rpmdsNotify(rpmds ds, const char * where, int rc);
/** \ingroup rpmds
* Return current dependency name pool id.
* @param ds dependency set

17
python/rpmds-py.c
View File

@ -97,21 +97,6 @@ rpmds_SetNoPromote(rpmdsObject * s, PyObject * args, PyObject * kwds)
return Py_BuildValue("i", rpmdsSetNoPromote(s->ds, nopromote));
}
static PyObject *
rpmds_Notify(rpmdsObject * s, PyObject * args, PyObject * kwds)
{
const char * where;
int rc;
char * kwlist[] = {"location", "returnCode", NULL};
if (!PyArg_ParseTupleAndKeywords(args, kwds, "si:Notify", kwlist,
&where, &rc))
return NULL;
rpmdsNotify(s->ds, where, rc);
Py_RETURN_NONE;
}
/* XXX rpmdsFind uses bsearch on s->ds, so a sort is needed. */
static PyObject *
rpmds_Sort(rpmdsObject * s)
@ -207,8 +192,6 @@ static struct PyMethodDef rpmds_methods[] = {
{"SetNoPromote",(PyCFunction)rpmds_SetNoPromote, METH_VARARGS|METH_KEYWORDS,
"ds.SetNoPromote(noPromote) -- Set noPromote for this instance.\n\n"
"If True non existing epochs are no longer equal to an epoch of 0."},
{"Notify", (PyCFunction)rpmds_Notify, METH_VARARGS|METH_KEYWORDS,
"ds.Notify(location, returnCode) -- Print debug info message\n\n if debugging is enabled."},
{"Sort", (PyCFunction)rpmds_Sort, METH_NOARGS,
NULL},
{"Find", (PyCFunction)rpmds_Find, METH_O,