From 3f912a1b42e1001b165bb82c4d0f17f3da3cdb00 Mon Sep 17 00:00:00 2001 From: lxnay Date: Sat, 17 Jan 2009 16:55:47 +0000 Subject: [PATCH] Entropy/*: - do not use mapping objects in function arguments but default them to None and use isinstance instead. Mapping objects can be really b*stards git-svn-id: http://svn.sabayonlinux.org/projects/entropy/trunk@2927 cd1c1023-2f26-0410-ae45-c471fc1f0318 --- libraries/entropy.py | 15 ++++++++++++--- 1 file changed, 12 insertions(+), 3 deletions(-) diff --git a/libraries/entropy.py b/libraries/entropy.py index dcd48fc67..9e6d73e09 100644 --- a/libraries/entropy.py +++ b/libraries/entropy.py @@ -2262,7 +2262,7 @@ class EquoInterface(TextInterface): if idpackage == -1: masked = True return masked, idreason, self.SystemSettings['pkg_masking_reasons'].get(idreason) - def get_masked_packages_tree(self, match, atoms = False, flat = False, matchfilter = set()): + def get_masked_packages_tree(self, match, atoms = False, flat = False, matchfilter = None): if not isinstance(matchfilter,set): matchfilter = set() @@ -2341,10 +2341,16 @@ class EquoInterface(TextInterface): return maskedtree - def generate_dependency_tree(self, atomInfo, empty_deps = False, deep_deps = False, matchfilter = set(), flat = False, filter_unsat_cache = {}, treecache = set(), keyslotcache = set()): + def generate_dependency_tree(self, atomInfo, empty_deps = False, deep_deps = False, matchfilter = None, flat = False, filter_unsat_cache = None, treecache = None, keyslotcache = None): if not isinstance(matchfilter,set): matchfilter = set() + if not isinstance(filter_unsat_cache,dict): + filter_unsat_cache = {} + if not isinstance(treecache,set): + treecache = set() + if not isinstance(keyslotcache,set): + keyslotcache = set() mydbconn = self.openRepositoryDatabase(atomInfo[1]) myatom = mydbconn.retrieveAtom(atomInfo[0]) @@ -8247,7 +8253,10 @@ class QAInterface: return broken - def scan_missing_dependencies(self, idpackages, dbconn, ask = True, self_check = False, repo = etpConst['officialrepositoryid'], black_list = set(), black_list_adder = None): + def scan_missing_dependencies(self, idpackages, dbconn, ask = True, self_check = False, repo = etpConst['officialrepositoryid'], black_list = None, black_list_adder = None): + + if not isinstance(black_list,set): + black_list = set() taint = False scan_msg = blue(_("Now searching for missing RDEPENDs"))