From: Panu Matilainen <pmatilai@redhat.com>
Date: Thu, 16 Dec 2010 12:11:25 +0000 (+0200)
Subject: Permit comparison operator strings (<, >= etc) in python ds constructor
X-Git-Tag: rpm-4.9.0-beta1~21
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=98b69e4367ff93de7f9652bdc6072ebc6c911973;p=platform%2Fupstream%2Frpm.git

Permit comparison operator strings (<, >= etc) in python ds constructor
- Creating ('foo', '>=', '1.2') dependency is much nicer than
  or'ing rpm.RPMSENSE_FOO for flags. Allow (but validate) the string
  usage, ints get passed as is.
(cherry picked from commit bf37b06d19b769572c06a667b31164d6ed279155)
---

diff --git a/python/rpmds-py.c b/python/rpmds-py.c
index cd933b5..7729d85 100644
--- a/python/rpmds-py.c
+++ b/python/rpmds-py.c
@@ -263,6 +263,45 @@ static int rpmds_init(rpmdsObject * s, PyObject *args, PyObject *kwds)
     return 0;
 }
 
+static int depflags(PyObject *o, rpmsenseFlags *senseFlags)
+{
+    int ok = 0;
+    PyObject *str = NULL;
+    rpmsenseFlags flags = RPMSENSE_ANY;
+
+    if (PyInt_Check(o)) {
+	ok = 1;
+	flags = PyInt_AsLong(o);
+    } else if (utf8FromPyObject(o, &str)) {
+	ok = 1;
+	for (const char *s = PyBytes_AsString(str); *s; s++) {
+	    switch (*s) {
+	    case '=':
+		flags |= RPMSENSE_EQUAL;
+		break;
+	    case '<':
+		flags |= RPMSENSE_LESS;
+		break;
+	    case '>':
+		flags |= RPMSENSE_GREATER;
+		break;
+	    default:
+		ok = 0;
+		break;
+	    }
+	}
+	Py_DECREF(str);
+    }
+
+    if (flags == (RPMSENSE_EQUAL|RPMSENSE_LESS|RPMSENSE_GREATER))
+	ok = 0;
+
+    if (ok)
+	*senseFlags = flags;
+
+    return ok;
+}
+
 static PyObject * rpmds_new(PyTypeObject * subtype, PyObject *args, PyObject *kwds)
 {
     PyObject *obj;
@@ -279,8 +318,12 @@ static PyObject * rpmds_new(PyTypeObject * subtype, PyObject *args, PyObject *kw
 	const char *name = NULL;
 	const char *evr = NULL;
 	rpmsenseFlags flags = RPMSENSE_ANY;
-	if (PyArg_ParseTuple(obj, "s|is", &name, &flags, &evr)) {
+	/* TODO: if flags are specified, evr should be required too */
+	if (PyArg_ParseTuple(obj, "s|O&s", &name, depflags, &flags, &evr)) {
 	    ds = rpmdsSingle(tagN, name, evr, flags);
+	} else {
+	    PyErr_SetString(PyExc_ValueError, "invalid dependency tuple");
+	    return NULL;
 	}
     } else if (hdrFromPyObject(obj, &h)) {
 	if (tagN == RPMTAG_NEVR) {