| 1 |
commit: 28ce242ff1bf55605227b1877aaba0b76388714c |
| 2 |
Author: Zac Medico <zmedico <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Wed Sep 28 05:26:27 2011 +0000 |
| 4 |
Commit: Zac Medico <zmedico <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Wed Sep 28 05:26:27 2011 +0000 |
| 6 |
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/portage.git;a=commit;h=28ce242f |
| 7 |
|
| 8 |
depgraph: handle unicode exception for bug 384749 |
| 9 |
|
| 10 |
--- |
| 11 |
pym/_emerge/depgraph.py | 5 +++-- |
| 12 |
1 files changed, 3 insertions(+), 2 deletions(-) |
| 13 |
|
| 14 |
diff --git a/pym/_emerge/depgraph.py b/pym/_emerge/depgraph.py |
| 15 |
index 00d9628..f9f4954 100644 |
| 16 |
--- a/pym/_emerge/depgraph.py |
| 17 |
+++ b/pym/_emerge/depgraph.py |
| 18 |
@@ -4480,7 +4480,7 @@ class depgraph(object): |
| 19 |
# matches (this can happen if an atom lacks a |
| 20 |
# category). |
| 21 |
show_invalid_depstring_notice( |
| 22 |
- pkg, depstr, str(e)) |
| 23 |
+ pkg, depstr, _unicode_decode("%s") % (e,)) |
| 24 |
del e |
| 25 |
raise |
| 26 |
if not success: |
| 27 |
@@ -4511,7 +4511,8 @@ class depgraph(object): |
| 28 |
except portage.exception.InvalidAtom as e: |
| 29 |
depstr = " ".join(vardb.aux_get(pkg.cpv, dep_keys)) |
| 30 |
show_invalid_depstring_notice( |
| 31 |
- pkg, depstr, "Invalid Atom: %s" % (e,)) |
| 32 |
+ pkg, depstr, |
| 33 |
+ _unicode_decode("Invalid Atom: %s") % (e,)) |
| 34 |
return False |
| 35 |
for cpv in stale_cache: |
| 36 |
del blocker_cache[cpv] |
Archives