[Uludag-commits] r15250 - in branches/pisi-db/pisi: . operations

[uludag-commits at pardus.org.tr]

Author: faik
Date: Sat Sep  1 21:04:30 2007
New Revision: 15250

Added:
   branches/pisi-db/pisi/operations/emerge.py
   branches/pisi-db/pisi/operations/helper.py
   branches/pisi-db/pisi/operations/install.py
   branches/pisi-db/pisi/operations/remove.py
   branches/pisi-db/pisi/operations/upgrade.py
Removed:
   branches/pisi-db/pisi/operations.py
Modified:
   branches/pisi-db/pisi/api.py
   branches/pisi-db/pisi/build.py
   branches/pisi-db/pisi/operations/__init__.py
Log:
Divide operations.py

Code became unreadable. Divide for easy maintanence. Code will
be simplified while porting to new db code.


Modified: branches/pisi-db/pisi/api.py
=================================================================
--- branches/pisi-db/pisi/api.py	(original)
+++ branches/pisi-db/pisi/api.py	Sat Sep  1 21:04:30 2007
@@ -37,10 +37,14 @@
 import pisi.metadata
 import pisi.file
 import pisi.version
-import pisi.operations
 import pisi.build
 import pisi.atomicoperations
 import pisi.operations.delta
+import pisi.operations.remove
+import pisi.operations.upgrade
+import pisi.operations.install
+import pisi.operations.helper
+import pisi.operations.emerge
 import pisi.comariface
 import pisi.signalhandler
 
@@ -153,7 +157,7 @@
     return set(ctx.packagedb.list_packages(repo = repo))
 
 def list_upgradable():
-    return filter(pisi.operations.is_upgradable, ctx.installdb.list_installed()) + ctx.packagedb.get_replaces().keys()
+    return filter(pisi.operations.helper.is_upgradable, ctx.installdb.list_installed()) + ctx.packagedb.get_replaces().keys()
 
 def package_graph(A, repo = pisi.db.installed, ignore_installed = False):
     """Construct a package relations graph.
@@ -478,34 +482,34 @@
 # from pisi.atomicoperations import resurrect_package, build
 
 def install(*args, **kw):
-    return pisi.operations.install(*args, **kw)
+    return pisi.operations.install.install(*args, **kw)
 
 def remove(*args, **kw):
-    return pisi.operations.remove(*args, **kw)
+    return pisi.operations.remove.remove(*args, **kw)
 
 def upgrade(*args, **kw):
-    return pisi.operations.upgrade(*args, **kw)
+    return pisi.operations.upgrade.upgrade(*args, **kw)
 
 def emerge(*args, **kw):
-    return pisi.operations.emerge(*args, **kw)
+    return pisi.operations.emerge.emerge(*args, **kw)
 
 def plan_install(*args, **kw):
-    return pisi.operations.plan_install_pkg_names(*args, **kw)
+    return pisi.operations.install.plan_install_pkg_names(*args, **kw)
 
 def plan_remove(*args, **kw):
-    return pisi.operations.plan_remove(*args, **kw)
+    return pisi.operations.remove.plan_remove(*args, **kw)
 
 def plan_upgrade(*args, **kw):
-    return pisi.operations.plan_upgrade(*args, **kw)
+    return pisi.operations.upgrade.plan_upgrade(*args, **kw)
 
 def upgrade_base(*args, **kw):
-    return pisi.operations.upgrade_base(*args, **kw)
+    return pisi.operations.upgrade.upgrade_base(*args, **kw)
 
 def calculate_conflicts(*args, **kw):
     return pisi.conflict.calculate_conflicts(*args, **kw)
 
 def reorder_base_packages(*args, **kw):
-    return pisi.operations.reorder_base_packages(*args, **kw)
+    return pisi.operations.helper.reorder_base_packages(*args, **kw)
 
 def build_until(*args, **kw):
     return pisi.build.build_until(*args, **kw)

Modified: branches/pisi-db/pisi/build.py
=================================================================
--- branches/pisi-db/pisi/build.py	(original)
+++ branches/pisi-db/pisi/build.py	Sat Sep  1 21:04:30 2007
@@ -29,7 +29,7 @@
 import pisi.file
 import pisi.context as ctx
 import pisi.dependency as dependency
-import pisi.operations as operations
+import pisi.operations.install as install
 import pisi.sourcearchive
 import pisi.files
 import pisi.fetcher
@@ -502,7 +502,7 @@
                 if ctx.ui.confirm(
                 _('Do you want to install the unsatisfied build dependencies')):
                     ctx.ui.info(_('Installing build dependencies.'))
-                    operations.install([dep.package for dep in dep_unsatis])
+                    install.install([dep.package for dep in dep_unsatis])
                 else:
                     fail()
             else:

Modified: branches/pisi-db/pisi/operations/__init__.py
=================================================================
--- branches/pisi-db/pisi/operations/__init__.py	(original)
+++ branches/pisi-db/pisi/operations/__init__.py	Sat Sep  1 21:04:30 2007
@@ -9,3 +9,4 @@
 #
 # Please read the COPYING file.
 #
+