From 498303250a3a6eb6c4f4dc07102eeb0a80535103 Mon Sep 17 00:00:00 2001
From: Colin Watson <cjwatson@canonical.com>
Date: Wed, 25 Sep 2013 13:31:50 +0100
Subject: [PATCH] Fix mismerge.
---
lib/britney-py.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/lib/britney-py.c b/lib/britney-py.c
index d8e2f8f..94833cf 100644
--- a/lib/britney-py.c
+++ b/lib/britney-py.c
@@ -123,7 +123,7 @@ static PyObject *dpkgpackages_add_binary(dpkgpackages *self, PyObject *args) {
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));
@@ -262,7 +262,7 @@ static PyObject *build_system(PyObject *self, PyObject *args) {
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));