From abe56e7aa79dae11b66d3793625d90571ecd6ae4 Mon Sep 17 00:00:00 2001 From: Faik Uygur Date: Fri, 15 Jun 2007 12:35:56 +0000 Subject: [PATCH] - in this namespace --- pisi/conflict.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pisi/conflict.py b/pisi/conflict.py index aec06922..b491b968 100644 --- a/pisi/conflict.py +++ b/pisi/conflict.py @@ -41,7 +41,7 @@ def calculate_conflicts(order, packagedb): 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) return conflicts @@ -63,7 +63,7 @@ def calculate_conflicts(order, packagedb): B_i = B_0.intersection(set(map(lambda c:c.package, pkg.conflicts))) conflicts_inorder_i = set() 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: conflicts_inorder_i.add(str(conflicted))