* keep generate_xyz_order api name consistency

* give pending_list to generate_pending_order as the list to order. this avoids 
  calling installdb.list_pending twice in configure_pending path. That call, reads 
  the entire installdb and puts it on a dict var. so this also would decrease the 
  memory usage.
This commit is contained in:
Faik Uygur
2006-12-06 20:23:07 +00:00
parent 7175dd4847
commit 6bb47b1ab9
2 changed files with 4 additions and 4 deletions
+2 -3
View File
@@ -234,9 +234,8 @@ def generate_conflicts(A):
(C, D, E) = calculate_conflicts(A, ctx.packagedb) (C, D, E) = calculate_conflicts(A, ctx.packagedb)
return (C, D, E) return (C, D, E)
def generate_pending_list(): def generate_pending_order(A):
# returns pending package list in reverse topological order of dependency # returns pending package list in reverse topological order of dependency
A = ctx.installdb.list_pending()
G_f = pgraph.PGraph(ctx.packagedb, pisi.itembyrepodb.installed) # construct G_f G_f = pgraph.PGraph(ctx.packagedb, pisi.itembyrepodb.installed) # construct G_f
for x in A.keys(): for x in A.keys():
G_f.add_package(x) G_f.add_package(x)
@@ -264,7 +263,7 @@ def configure_pending():
# start with pending packages # start with pending packages
# configure them in reverse topological order of dependency # configure them in reverse topological order of dependency
A = ctx.installdb.list_pending() A = ctx.installdb.list_pending()
order = generate_pending_list() order = generate_pending_order(A)
try: try:
import pisi.comariface as comariface import pisi.comariface as comariface
for x in order: for x in order:
+2 -1
View File
@@ -1472,7 +1472,8 @@ Lists packages waiting to be configured.
def run(self): def run(self):
self.init(database = True, write = False) self.init(database = True, write = False)
order = api.generate_pending_list() A = ctx.installdb.list_pending()
order = api.generate_pending_order(A)
if len(order): if len(order):
for p in order: for p in order: