From 0c4bbfa36f36d42cc3d700e58d531e05ba898e0e Mon Sep 17 00:00:00 2001 From: Kiwinote Date: Mon, 28 Jun 2010 12:54:51 +0100 Subject: Revert own change, as we can conflict/provide the same package --- apt/debfile.py | 13 ------------- 1 file changed, 13 deletions(-) (limited to 'apt') diff --git a/apt/debfile.py b/apt/debfile.py index 1c33d25f..c0ae4e28 100644 --- a/apt/debfile.py +++ b/apt/debfile.py @@ -261,19 +261,6 @@ 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_name, con_ver, con_oper)] in self.conflicts: - for pro in self.provides: - if con_name == pro[0][0]: - if con_ver: - pro_ver = self._sections["Version"] - 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 - else: - #print "Conflicts with provided pkg!" - self._failure_string = "Conflicts with a provided package" - return False res = True for or_group in self.conflicts: if self._check_conflicts_or_group(or_group): -- cgit v1.2.3