Pisilinux3/pisi
3
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

- in this namespace

Browse Source
This commit is contained in:
Faik Uygur
2007-06-15 12:35:56 +00:00
parent e3852abf74
commit abe56e7aa7
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pisi/conflict.py
+2 -2
View File
@@ -41,7 +41,7 @@ def calculate_conflicts(order, packagedb):
conflicts = [] conflicts = []
for conflict in pkg.conflicts: for conflict in pkg.conflicts:
if conflict.package not in order and pisi.conflict.installed_package_conflicts(conflict): if conflict.package not in order and installed_package_conflicts(conflict):
conflicts.append(conflict) conflicts.append(conflict)
return conflicts return conflicts
@@ -63,7 +63,7 @@ def calculate_conflicts(order, packagedb):
B_i = B_0.intersection(set(map(lambda c:c.package, pkg.conflicts))) B_i = B_0.intersection(set(map(lambda c:c.package, pkg.conflicts)))
conflicts_inorder_i = set() conflicts_inorder_i = set()
for p in map(lambda x:packagedb.get_package(x), B_i): for p in map(lambda x:packagedb.get_package(x), B_i):
conflicted = pisi.conflict.package_conflicts(p, pkg.conflicts) conflicted = package_conflicts(p, pkg.conflicts)
if conflicted: if conflicted:
conflicts_inorder_i.add(str(conflicted)) conflicts_inorder_i.add(str(conflicted))