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

[uludag-commits at pardus.org.tr]

Author: faik
Date: Wed Oct  3 13:26:04 2007
New Revision: 15605

Modified:
   branches/pisi-db/RefactorPlan
   branches/pisi-db/pisi/dependency.py
   branches/pisi-db/pisi/relation.py
Log:
pkg_name parameter is unused

satisfies_relation function takes an unused parameter. Also remove this item from RefactorPlan.


Modified: branches/pisi-db/RefactorPlan
=================================================================
--- branches/pisi-db/RefactorPlan	(original)
+++ branches/pisi-db/RefactorPlan	Wed Oct  3 13:26:04 2007
@@ -96,10 +96,6 @@
 ones named tmpDir/tmp_dir/target_dir) are redundant now. See
 http://liste.uludag.org.tr/uludag-commits/2007-February/010070.html
 
-* conflict.py
-conflicts method takes a pkg_name parameter but doesn't use it at all
-
-
 ==> Fixes (that need API breakage)
 * http://liste.uludag.org.tr/uludag-commits/2007-February/010117.html
 

Modified: branches/pisi-db/pisi/dependency.py
=================================================================
--- branches/pisi-db/pisi/dependency.py	(original)
+++ branches/pisi-db/pisi/dependency.py	Wed Oct  3 13:26:04 2007
@@ -45,7 +45,7 @@
     else:
         pkg = dict[pkg_name]
         (version, release) = (pkg.version, pkg.release)
-        return depinfo.satisfies_relation(pkg_name, version, release)
+        return depinfo.satisfies_relation(version, release)
 
 def installed_satisfies_dep(depinfo):
     """determine if a package in *repository* satisfies given
@@ -61,7 +61,7 @@
     else:
         pkg = ctx.packagedb.get_package(pkg_name)
         (version, release) = (pkg.version, pkg.release)
-        return depinfo.satisfies_relation(pkg_name, version, release)
+        return depinfo.satisfies_relation(version, release)
 
 def satisfies_dependencies(pkg, deps, sat = installed_satisfies_dep):
     for dep in deps:

Modified: branches/pisi-db/pisi/relation.py
=================================================================
--- branches/pisi-db/pisi/relation.py	(original)
+++ branches/pisi-db/pisi/relation.py	Wed Oct  3 13:26:04 2007
@@ -31,7 +31,7 @@
     a_releaseFrom = [autoxml.String, autoxml.optional]
     a_releaseTo = [autoxml.String, autoxml.optional]
 
-    def satisfies_relation(self, pkg_name, version, release):
+    def satisfies_relation(self, version, release):
         ret = True
         v = pisi.version.Version(version)
         if self.version:
@@ -56,4 +56,4 @@
     else:
         pkg = ctx.installdb.get_package(pkg_name)
         (version, release) = (pkg.version, pkg.release)
-        return relation.satisfies_relation(pkg_name, version, release)
+        return relation.satisfies_relation(version, release)