summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKiwinote <kiwinote@gmail.com>2010-06-28 11:14:20 +0100
committerKiwinote <kiwinote@gmail.com>2010-06-28 11:14:20 +0100
commit1c66ccad17b32488aaac0a78016f5378a789bfb1 (patch)
tree4b3d731846ca60f2fc87aa0c7d69294979e33e6c
parent944626c874a7b42043d279d918c92c407627a314 (diff)
downloadpython-apt-1c66ccad17b32488aaac0a78016f5378a789bfb1.tar.gz
self.conflicts returns name, ver, oper, rather than name, oper, ver
-rw-r--r--apt/debfile.py8
1 files changed, 4 insertions, 4 deletions
diff --git a/apt/debfile.py b/apt/debfile.py
index f74b6981..1c33d25f 100644
--- a/apt/debfile.py
+++ b/apt/debfile.py
@@ -261,12 +261,12 @@ class DebPackage(object):
Check if the package conflicts with a existing or to be installed
package. Return True if the pkg is OK.
"""
- for con in self.conflicts:
+ for [(con_name, con_ver, con_oper)] in self.conflicts:
for pro in self.provides:
- if con[0][0] == pro[0][0]:
- if con[0][2]:
+ if con_name == pro[0][0]:
+ if con_ver:
pro_ver = self._sections["Version"]
- if apt_pkg.check_dep(pro_ver, con[0][1], con[0][2]):
+ if apt_pkg.check_dep(pro_ver, con_oper, con_ver):
#print "Conflicts with provided pkg!"
self._failure_string = "Conflicts with a provided package"
return False