sablink/entropy
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

entropy.client.interfaces.dep: fix generate_dependency_tree

Browse Source 
On some circumstances, post dependencies got a deplevel of 0, which
was overwritten by conflicts data. This patch fix the issue by
making deplevels >= 0 to always start from 1, leaving deplevel = 0
to conflicting packages.

Moreover, this patch improve generate_dependency_tree performance.
This commit is contained in:
Fabio Erculiani
2009-05-03 14:57:20 +02:00
parent 2c3f9fe24a
commit 7dae8b0bde
1 changed files with 10 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
libraries/entropy/client/interfaces/dep.py
+10 -12
View File
@@ -757,16 +757,9 @@ class CalculatorsMixin:
mydep = mybuffer.pop()
continue
# already analyzed by the calling function
if match in matchfilter:
mydep = mybuffer.pop()
continue
matchfilter.add(match)
treedepth = dep_level+1
# all checks passed, well done
matchfilter.add(match)
treedepth = dep_level+1
deptree.add((dep_level,match)) # add match
# extra hooks
@@ -794,7 +787,9 @@ class CalculatorsMixin:
# PDEPENDs support
if myundeps:
post_deps = [x for x in matchdb.retrievePostDependencies(m_idpackage) if x in myundeps]
myundeps = [x for x in myundeps if x not in post_deps]
if post_deps:
# only filter if post_deps contains something
myundeps = [x for x in myundeps if x not in post_deps]
for x in post_deps: mybuffer.push((-1,x)) # always after the package itself
for x in myundeps: mybuffer.push((treedepth,x))
@@ -806,9 +801,12 @@ class CalculatorsMixin:
if flat: return [x[1] for x in deptree],0
newdeptree = {}
for key,item in deptree:
if key not in newdeptree: newdeptree[key] = set()
newdeptree[key].add(item)
for key, item in deptree:
if key >= 0:
# this makes sure that key is never = 0
key += 1
obj = newdeptree.setdefault(key, set())
obj.add(item)
# conflicts
newdeptree[0] = conflicts