diff options
| author | fuzzyray <fuzzyray@gentoo.org> | 2008-08-22 21:38:27 +0000 |
|---|---|---|
| committer | fuzzyray <fuzzyray@gentoo.org> | 2008-08-22 21:38:27 +0000 |
| commit | 32593bfabaffa866abd335d078e8f7272c0dc3af (patch) | |
| tree | c685d68601c9e856d7151b3ce506db6e92ee2496 | |
| parent | f2d3b09b3287f52c1e9cd8ffa6c39585a9315dae (diff) | |
| download | gentoolkit-32593bfabaffa866abd335d078e8f7272c0dc3af.tar.gz | |
Fix find_packages and find_installed_packages to print a warning instead of a traceback when an InvalidAtom exception occurs. (Bug #234358)
svn path=/; revision=507
| -rw-r--r-- | trunk/ChangeLog | 5 | ||||
| -rw-r--r-- | trunk/src/gentoolkit/helpers.py | 7 |
2 files changed, 12 insertions, 0 deletions
diff --git a/trunk/ChangeLog b/trunk/ChangeLog index 17124b6..8f1956c 100644 --- a/trunk/ChangeLog +++ b/trunk/ChangeLog @@ -1,4 +1,9 @@ 2008-08-22: Paul Varner <fuzzyray@gentoo.org> + * gentoolkit: Fix find_packages and find_installed_packages to print + a warning instead of a traceback when an InvalidAtom exception occurs. + (Bug #234358) + +2008-08-22: Paul Varner <fuzzyray@gentoo.org> * equery: Fix equery belongs to strip multiple slashes from path names. (Bug #234584) diff --git a/trunk/src/gentoolkit/helpers.py b/trunk/src/gentoolkit/helpers.py index 6dba7db..bf2b1b1 100644 --- a/trunk/src/gentoolkit/helpers.py +++ b/trunk/src/gentoolkit/helpers.py @@ -10,6 +10,7 @@ import portage from gentoolkit import * from package import * +from pprinter import print_warn try: from portage.util import unique_array except ImportError: @@ -37,6 +38,9 @@ def find_packages(search_key, masked=False): t += portage.db["/"]["vartree"].dbapi.match(cp) else: raise ValueError(e) + except portage_exception.InvalidAtom, e: + print_warn("Invalid Atom: '%s'" % str(e)) + return [] # Make the list of packages unique t = unique_array(t) t.sort() @@ -54,6 +58,9 @@ def find_installed_packages(search_key, masked=False): t += portage.db["/"]["vartree"].dbapi.match(cp) else: raise ValueError(e) + except portage_exception.InvalidAtom, e: + print_warn("Invalid Atom: '%s'" % str(e)) + return [] return [Package(x) for x in t] def find_best_match(search_key): |