diff options
| author | necoro <> | 2006-12-06 22:33:49 +0000 |
|---|---|---|
| committer | necoro <> | 2006-12-06 22:33:49 +0000 |
| commit | 437364739954d8281ad199e2fa0a9fd57ad8c344 (patch) | |
| tree | 8f024f3dc4abf4664013a6dd180ea50d499e603e /portato/backend/portage_helper.py | |
| parent | 285ef518c9f99349153581d9addba665ba3944eb (diff) | |
| download | portato-437364739954d8281ad199e2fa0a9fd57ad8c344.tar.gz portato-437364739954d8281ad199e2fa0a9fd57ad8c344.tar.bz2 portato-437364739954d8281ad199e2fa0a9fd57ad8c344.zip | |
added handling of masked packages during an update-world; small changes in gentoolkit-code
Diffstat (limited to 'portato/backend/portage_helper.py')
| -rw-r--r-- | portato/backend/portage_helper.py | 24 |
1 files changed, 12 insertions, 12 deletions
diff --git a/portato/backend/portage_helper.py b/portato/backend/portage_helper.py index 1726323..814a0bb 100644 --- a/portato/backend/portage_helper.py +++ b/portato/backend/portage_helper.py @@ -78,22 +78,22 @@ def find_packages (search_key, masked=False): try: if masked: - t = portage.db["/"]["porttree"].dbapi.xmatch("match-all", search_key) - t += portage.db["/"]["vartree"].dbapi.match(search_key) + t = porttree.dbapi.xmatch("match-all", search_key) + t += vartree.dbapi.match(search_key) else: - t = portage.db["/"]["porttree"].dbapi.match(search_key) - t += portage.db["/"]["vartree"].dbapi.match(search_key) - # catch the "amgigous package" Exception + t = porttree.dbapi.match(search_key) + t += vartree.dbapi.match(search_key) + # catch the "ambigous package" Exception except ValueError, e: if type(e[0]) == types.ListType: t = [] for cp in e[0]: if masked: - t += portage.db["/"]["porttree"].dbapi.xmatch("match-all", cp) - t += portage.db["/"]["vartree"].dbapi.match(cp) + t += porttree.dbapi.xmatch("match-all", cp) + t += vartree.dbapi.match(cp) else: - t += portage.db["/"]["porttree"].dbapi.match(cp) - t += portage.db["/"]["vartree"].dbapi.match(cp) + t += porttree.dbapi.match(cp) + t += vartree.dbapi.match(cp) else: raise ValueError(e) # Make the list of packages unique @@ -113,13 +113,13 @@ def find_installed_packages (search_key, masked=False): @rtype: backend.Package[]""" try: - t = portage.db["/"]["vartree"].dbapi.match(search_key) - # catch the "amgigous package" Exception + t = vartree.dbapi.match(search_key) + # catch the "ambigous package" Exception except ValueError, e: if type(e[0]) == types.ListType: t = [] for cp in e[0]: - t += portage.db["/"]["vartree"].dbapi.match(cp) + t += vartree.dbapi.match(cp) else: raise ValueError(e) |