[Uludag-commits] r15572 - branches/pisi-db/pisi/operations

[uludag-commits at pardus.org.tr]

Author: faik
Date: Mon Oct  1 11:35:48 2007
New Revision: 15572

Modified:
   branches/pisi-db/pisi/operations/install.py
   branches/pisi-db/pisi/operations/upgrade.py
Log:
remove_x functions are in remove operations module


Modified: branches/pisi-db/pisi/operations/install.py
=================================================================
--- branches/pisi-db/pisi/operations/install.py	(original)
+++ branches/pisi-db/pisi/operations/install.py	Mon Oct  1 11:35:48 2007
@@ -185,7 +185,7 @@
     if not ctx.get_option('ignore_package_conflicts'):
         conflicts = operations.helper.check_conflicts(order, packagedb)
         if conflicts:
-            operations.helper.remove_conflicting_packages(conflicts)
+            operations.remove.remove_conflicting_packages(conflicts)
     order.reverse()
     ctx.ui.info(_('Installation order: ') + util.strlist(order) )
 
@@ -228,5 +228,5 @@
     if not ctx.get_option('ignore_package_conflicts') and not ignore_package_conflicts:
         conflicts = operations.helper.check_conflicts(order, ctx.packagedb)
         if conflicts:
-            operations.helper.remove_conflicting_packages(conflicts)
+            operations.remove.remove_conflicting_packages(conflicts)
     return G_f, order

Modified: branches/pisi-db/pisi/operations/upgrade.py
=================================================================
--- branches/pisi-db/pisi/operations/upgrade.py	(original)
+++ branches/pisi-db/pisi/operations/upgrade.py	Mon Oct  1 11:35:48 2007
@@ -137,12 +137,12 @@
 
     if not ctx.get_option('ignore_package_conflicts'):
         if conflicts:
-            operations.helper.remove_conflicting_packages(conflicts)
+            operations.remove.remove_conflicting_packages(conflicts)
 
     if replaces:
-        operations.helper.remove_replaced_packages(order, replaces)
+        operations.remove.remove_replaced_packages(order, replaces)
 
-    operations.helper.remove_obsoleted_packages()
+    operations.remove.remove_obsoleted_packages()
     
     for path in paths:
         ctx.ui.info(util.colorize(_("Installing %d / %d") % (paths.index(path)+1, len(paths)), "yellow"))