From f87229e26d95445c9e1ef57e140b3662381363af Mon Sep 17 00:00:00 2001 From: Ben Hutchings Date: Tue, 10 Nov 2015 12:40:25 +0000 Subject: [PATCH] debian/lib/python: Never merge package relations with a different version operator This doesn't currently make any difference, but it's obviously wrong to ignore the operator. --- debian/lib/python/debian_linux/debian.py | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/debian/lib/python/debian_linux/debian.py b/debian/lib/python/debian_linux/debian.py index e59e64f44..e58b78202 100644 --- a/debian/lib/python/debian_linux/debian.py +++ b/debian/lib/python/debian_linux/debian.py @@ -283,7 +283,8 @@ class PackageRelationGroup(list): def _search_value(self, value): for i, j in zip(self, value): - if i.name != j.name or i.version != j.version: + if i.name != j.name or i.operator != j.operator or \ + i.version != j.version: return None return self @@ -352,6 +353,9 @@ class PackageRelationEntry(object): def __str__(self): return self.operators_text[self._op] + def __eq__(self, other): + return type(other) == type(self) and self._op == other._op + def __init__(self, value=None, override_arches=None): if not isinstance(value, str): raise ValueError