* plan_install needs it. change name.

* plan_upgrade does not need it

pisi/api.py

@@ -197,7 +197,7 @@ def package_graph(A, repo = pisi.itembyrepodb.installed, ignore_installed = Fals
 def generate_install_order(A):
     # returns the install order of the given install package list with any extra
     # dependency that is also going to be installed
-    G_f, order = plan_install(A, ignore_conflicts = True)
+    G_f, order = plan_install(A, ignore_package_conflicts = True)
     return order
 
 def generate_remove_order(A):
@@ -209,7 +209,7 @@ def generate_remove_order(A):
 def generate_upgrade_order(A):
     # returns the upgrade order of the given upgrade package list with any needed extra
     # dependency
-    G_f, order = plan_upgrade(A, ignore_conflicts = True)
+    G_f, order = plan_upgrade(A)
     return order
 
 def generate_base_upgrade(A):

pisi/operations.py

@@ -361,7 +361,7 @@ def install_pkg_names(A, reinstall = False):
     if 'pisi' in order and pisi_installed:
         upgrade_pisi()
 
-def plan_install_pkg_names(A, ignore_conflicts = False):
+def plan_install_pkg_names(A, ignore_package_conflicts = False):
     # try to construct a pisi graph of packages to
     # install / reinstall
 
@@ -389,7 +389,7 @@ def plan_install_pkg_names(A, ignore_conflicts = False):
         G_f.write_graphviz(sys.stdout)
     order = G_f.topological_sort()
     order.reverse()
-    if not ctx.get_option('ignore_package_conflicts') and not ignore_conflicts:
+    if not ctx.get_option('ignore_package_conflicts') and not ignore_package_conflicts:
         conflicts = check_conflicts(order, ctx.packagedb)
         if conflicts:
             remove_conflicting_packages(conflicts)
@@ -500,7 +500,7 @@ def upgrade_pkg_names(A = []):
     if 'pisi' in order:
         upgrade_pisi()
 
-def plan_upgrade(A, ignore_build = False, ignore_conflicts = False):
+def plan_upgrade(A, ignore_build = False):
     # try to construct a pisi graph of packages to
     # install / reinstall