diff options
| author | genone <genone@gentoo.org> | 2004-03-13 11:17:31 +0000 |
|---|---|---|
| committer | genone <genone@gentoo.org> | 2004-03-13 11:17:31 +0000 |
| commit | 82078b0ed488751bc7e5295a8cca9cb9b0bb2275 (patch) | |
| tree | 1c8c8f826a688ee0e33485a15a12351c25e2fd1b /trunk/src/equery | |
| parent | 6b67b13289bdb7e7f115d93b92b0fa0aa5969f5f (diff) | |
| download | gentoolkit-82078b0ed488751bc7e5295a8cca9cb9b0bb2275.tar.gz | |
Bugfixes for #42160, #40935, #43389
svn path=/; revision=90
Diffstat (limited to 'trunk/src/equery')
| -rw-r--r-- | trunk/src/equery/ChangeLog | 4 | ||||
| -rwxr-xr-x | trunk/src/equery/equery | 7 |
2 files changed, 8 insertions, 3 deletions
diff --git a/trunk/src/equery/ChangeLog b/trunk/src/equery/ChangeLog index 96cdd1e..0236b3c 100644 --- a/trunk/src/equery/ChangeLog +++ b/trunk/src/equery/ChangeLog @@ -1,3 +1,7 @@ +2004-03-13 Marius Mauch <genone@gentoo.org> + * fixing descriptions for local USE flags + * more checking on exceptions + 2004-01-23 Marius Mauch <genone@gentoo.org> * now catches Exceptions thrown by portage * minor bugfixes diff --git a/trunk/src/equery/equery b/trunk/src/equery/equery index c534a4f..44464a1 100755 --- a/trunk/src/equery/equery +++ b/trunk/src/equery/equery @@ -346,7 +346,7 @@ class CmdDisplayUSEs(Command): desc = usedesc[u] except KeyError: try: - desc = uselocaldesc[p][u] + desc = uselocaldesc[p.get_category()+"/"+p.get_name()][u] except KeyError: desc = "" @@ -946,7 +946,8 @@ if __name__ == "__main__": try: cmd.perform(local_opts) except KeyError, e: - if string.find(e[0], "Specific key requires operator") == 0: + if e and type(e[0]) == types.ListType and \ + string.find(e[0], "Specific key requires operator") == 0: print red("!!!"), "Invalid syntax: missing operator" print red("!!!"), "If you want only specific versions please use one of" print red("!!!"), "the following operators as prefix for the package name:" @@ -959,7 +960,7 @@ if __name__ == "__main__": print red("!!!"), e sys.exit(2) except ValueError, e: - if type(e[0]) == types.ListType: + if e and type(e[0]) == types.ListType: print red("!!!"), "Ambiguous package name \"%s\"" % local_opts[0] print red("!!!"), "Please use one of the following long names:" for p in e[0]: |