modify based on code inspection comments. - continue work in weekend.

This commit is contained in:
lizhi-rocky
2010-10-18 10:55:19 +08:00
parent 4fe47045f6
commit 4a4d822cfd
4 changed files with 95 additions and 97 deletions

View File

@@ -62,16 +62,7 @@ def construct_depended():
Depended.dict[dep].depended_by.add(d.name)
def get_extra_depending(pkg_list = []):
l = []
for g in ri_data.Group.dict.values():
if g.install != 'no':
l.extend([ p for p in g.mandatory ])
if g.selection == 'manual':
l.extend([ p[0] for p in g.optional if p[1] == 'yes' ])
else:
l.extend([ p[0] for p in g.optional ])
l = l + pkg_list
l = ri_data.Group.get_install_pkgs() + pkg_list
set1 = set(l)
set2 = set(set1)
@@ -79,9 +70,12 @@ def get_extra_depending(pkg_list = []):
for d in set1:
set2.update(Depending.dict[d].depending)
global extra_pkgs
extra_pkgs = set2.difference(set1)
res = {}
for d in set2.difference(set1):
for d in extra_pkgs:
res[d] = Depended.dict[d].depended_by.intersection(set1)
return res
extra_pkgs = []