Return [] for tags with no contents.

CVS patchset: 7078
CVS date: 2004/01/14 16:20:04

diff --git a/python/header-py.c b/python/header-py.c
index 6def28c6998cf226bdf2aee8530d59b953479f29..a04121f07a79bc2dd2d660e7cb9f884e84dfe991 100644 (file)
--- a/python/header-py.c
+++ b/python/header-py.c
@@ -490,6 +490,7 @@ static PyObject * hdr_subscript(hdrObject * s, PyObject * item)
        }
     }
 
+    /* Retrieve data from extension or header. */
     if (ext) {
         ext->u.tagFunction(s->h, &type, (const void **) &data, &count, &freeData);
     } else {
@@ -498,6 +499,8 @@ static PyObject * hdr_subscript(hdrObject * s, PyObject * item)
             return NULL;
         }
         
+       if (!rpmHeaderGetEntry(s->h, tag, &type, &data, &count))
+           return PyList_New(0);
     }
 
     switch (tag) {
@@ -538,16 +541,6 @@ static PyObject * hdr_subscript(hdrObject * s, PyObject * item)
         break;
     }
 
-    if (!rpmHeaderGetEntry(s->h, tag, &type, &data, &count)) {
-       if (forceArray) {
-           return PyList_New(0);
-       }
-       else {
-            Py_INCREF(Py_None);
-            return Py_None;
-       }
-    }
-
     switch (type) {
     case RPM_BIN_TYPE:
        o = PyString_FromStringAndSize(data, count);