make ignore-file-conflicts actually work...

2006-07-06 23:43:14 +00:00
parent 2b9954aece
commit bfb610399f
1 changed files with 6 additions and 3 deletions
@@ -160,6 +160,7 @@ in the respective order to satisfy extra dependencies:
    if ctx.config.get_option('debug'):
        G_f.write_graphviz(sys.stdout)
    order = G_f.topological_sort()
+    if not ctx.get_option('ignore_file_conflicts'):
        check_conflicts(order, packagedb)
    order.reverse()
    ctx.ui.info(_('Installation order: ') + util.strlist(order) )
@@ -355,6 +356,7 @@ def plan_install_pkg_names(A):
        G_f.write_graphviz(sys.stdout)
    order = G_f.topological_sort()
    order.reverse()
+    if not ctx.get_option('ignore_file_conflicts'):
        check_conflicts(order, ctx.packagedb)
    return G_f, order

@@ -519,6 +521,7 @@ def plan_upgrade(A, ignore_build = False):
        G_f.write_graphviz(sys.stdout)
    order = G_f.topological_sort()
    order.reverse()
+    if not ctx.get_option('ignore_file_conflicts'):
        check_conflicts(order, ctx.packagedb)
    return G_f, order