diff --git a/britney.py b/britney.py index 037645f..d2bcbd6 100755 --- a/britney.py +++ b/britney.py @@ -525,7 +525,6 @@ class Britney(object): version, get_field('Architecture'), get_field('Multi-Arch'), - None, # Pre-depends - leave as None for the C-code deps, ', '.join(final_conflicts_list) or None, get_field('Provides'), diff --git a/consts.py b/consts.py index eba22d2..827e7d4 100644 --- a/consts.py +++ b/consts.py @@ -30,11 +30,8 @@ SOURCE = 2 SOURCEVER = 3 ARCHITECTURE = 4 MULTIARCH = 5 -# PREDEPENDS = 6 - No longer used by the python code -# - The C-code needs it for alignment reasons and still check it -# but ignore it if it is None (so keep it None). -DEPENDS = 7 -CONFLICTS = 8 -PROVIDES = 9 -RDEPENDS = 10 -RCONFLICTS = 11 +DEPENDS = 6 +CONFLICTS = 7 +PROVIDES = 8 +RDEPENDS = 9 +RCONFLICTS = 10 diff --git a/lib/britney-py.c b/lib/britney-py.c index 28ace3c..94833cf 100644 --- a/lib/britney-py.c +++ b/lib/britney-py.c @@ -85,6 +85,7 @@ static PyObject *dpkgpackages_add_binary(dpkgpackages *self, PyObject *args) { pkg->package = strdup(pkg_name); pkg->priority = 0; pkg->details = NULL; + pkg->depends[1] = NULL; pkg->depends[2] = NULL; pkg->depends[3] = NULL; @@ -118,17 +119,11 @@ static PyObject *dpkgpackages_add_binary(dpkgpackages *self, PyObject *args) { pyString = PyList_GetItem(value, 7); if (pyString == NULL) return NULL; - if (pyString != Py_None) { - pkg->depends[1] = read_dep_andor(PyString_AsString(pyString)); - } else pkg->depends[1] = NULL; - - pyString = PyList_GetItem(value, 8); - if (pyString == NULL) return NULL; if (pyString != Py_None) { pkg->conflicts = read_dep_and(PyString_AsString(pyString)); } else pkg->conflicts = NULL; - pyString = PyList_GetItem(value, 9); + pyString = PyList_GetItem(value, 8); if (pyString == NULL) return NULL; if (pyString != Py_None) { pkg->provides = read_packagenames(PyString_AsString(pyString)); @@ -211,12 +206,11 @@ static PyObject *build_system(PyObject *self, PyObject *args) { # SOURCEVER = 3 # ARCHITECTURE = 4 # MULTIARCH = 5 - # PREDEPENDS = 6 - # DEPENDS = 7 - # CONFLICTS = 8 - # PROVIDES = 9 - # RDEPENDS = 10 - # RCONFLICTS = 11 + # DEPENDS = 6 + # CONFLICTS = 7 + # PROVIDES = 8 + # RDEPENDS = 9 + # RCONFLICTS = 10 */ dpkg_packages *dpkg_pkgs = new_packages(arch); @@ -230,6 +224,7 @@ static PyObject *build_system(PyObject *self, PyObject *args) { pkg->package = strdup(PyString_AsString(key)); pkg->priority = 0; pkg->details = NULL; + pkg->depends[1] = NULL; pkg->depends[2] = NULL; pkg->depends[3] = NULL; @@ -263,17 +258,11 @@ static PyObject *build_system(PyObject *self, PyObject *args) { pyString = PyList_GetItem(value, 7); if (pyString == NULL) continue; - if (pyString != Py_None) { - pkg->depends[1] = read_dep_andor(PyString_AsString(pyString)); - } else pkg->depends[1] = NULL; - - pyString = PyList_GetItem(value, 8); - if (pyString == NULL) continue; if (pyString != Py_None) { pkg->conflicts = read_dep_and(PyString_AsString(pyString)); } else pkg->conflicts = NULL; - pyString = PyList_GetItem(value, 9); + pyString = PyList_GetItem(value, 8); if (pyString == NULL) continue; if (pyString != Py_None) { pkg->provides = read_packagenames(PyString_AsString(pyString));