| 1 |
commit: d318bcce356b55d481e78b8cf511d6698f67eee5 |
| 2 |
Author: Zac Medico <zmedico <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Fri Sep 2 15:06:58 2011 +0000 |
| 4 |
Commit: Zac Medico <zmedico <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Fri Sep 2 15:06:58 2011 +0000 |
| 6 |
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/portage.git;a=commit;h=d318bcce |
| 7 |
|
| 8 |
vartree: add missing _merge_unicode_error import |
| 9 |
|
| 10 |
--- |
| 11 |
pym/portage/dbapi/vartree.py | 4 ++-- |
| 12 |
1 files changed, 2 insertions(+), 2 deletions(-) |
| 13 |
|
| 14 |
diff --git a/pym/portage/dbapi/vartree.py b/pym/portage/dbapi/vartree.py |
| 15 |
index 70816b1..ba2cc08 100644 |
| 16 |
--- a/pym/portage/dbapi/vartree.py |
| 17 |
+++ b/pym/portage/dbapi/vartree.py |
| 18 |
@@ -18,7 +18,7 @@ portage.proxy.lazyimport.lazyimport(globals(), |
| 19 |
'portage.locks:lockdir,unlockdir,lockfile,unlockfile', |
| 20 |
'portage.output:bold,colorize', |
| 21 |
'portage.package.ebuild.doebuild:doebuild_environment,' + \ |
| 22 |
- '_spawn_phase', |
| 23 |
+ '_merge_unicode_error', '_spawn_phase', |
| 24 |
'portage.package.ebuild.prepare_build_dirs:prepare_build_dirs', |
| 25 |
'portage.update:fixdbentries', |
| 26 |
'portage.util:apply_secpass_permissions,ConfigProtect,ensure_dirs,' + \ |
| 27 |
@@ -3352,7 +3352,7 @@ class dblink(object): |
| 28 |
break |
| 29 |
|
| 30 |
if unicode_errors: |
| 31 |
- eerror(portage._merge_unicode_error(unicode_errors)) |
| 32 |
+ eerror(_merge_unicode_error(unicode_errors)) |
| 33 |
|
| 34 |
if paths_with_newlines: |
| 35 |
msg = [] |
Archives