Handle non-existent dependency sets in python (RhBug:593553)

- rpmdsNew() returns NULL if the requested dependency type doesn't
  exist in the header. The C-side API can handle NULL to all rpmds
  "methods" and this is how librpm deals with non-existent sets rather
  than waste memory on for empty ds structures. However the python side
  wasn't expecting NULL for legal requests (but not setting error either)
  and thus blowing up with SystemError exception.
- Raise TypeError on illegal arguments to rpm.ds constructor, and present
  non-existent dependency sets as empty rpm.ds objects to python. This
  lets python callers use iteration over ds items regardless of whether
  the dependency actually exists or not. The alternative of returning
  None (or raising exceptions) would break existing code for no
  particularly good reason.
This commit is contained in:
Panu Matilainen 2010-05-19 10:12:43 +03:00
parent 2b7884ce29
commit 0e0e332b46
1 changed files with 3 additions and 2 deletions

View File

@ -288,10 +288,11 @@ static PyObject * rpmds_new(PyTypeObject * subtype, PyObject *args, PyObject *kw
} else {
ds = rpmdsNew(h, tagN, 0);
}
} else {
PyErr_SetString(PyExc_TypeError, "header or tuple expected");
return NULL;
}
if (ds == NULL) return NULL;
return rpmds_Wrap(subtype, ds);
}