From: Fabian Groffen <grobian@gentoo.org>
Date: Sat, 20 Aug 2011 17:50:06 +0000 (+0200)
Subject: Merge remote-tracking branch 'overlays-gentoo-org/master' into prefix
X-Git-Url: http://git.tremily.us/gitweb.cgi?a=commitdiff_plain;h=7c8aa70f94de389fa452bbc8147de21a1e19a6cb;p=portage.git

Merge remote-tracking branch 'overlays-gentoo-org/master' into prefix

Conflicts:
	pym/portage/elog/mod_save.py
---

7c8aa70f94de389fa452bbc8147de21a1e19a6cb
diff --cc pym/portage/elog/mod_save.py
index d1c9bb86c,091bbf86d..7f971826c
--- a/pym/portage/elog/mod_save.py
+++ b/pym/portage/elog/mod_save.py
@@@ -10,8 -11,7 +11,8 @@@ from portage import _unicode_decod
  from portage import _unicode_encode
  from portage.data import portage_gid, portage_uid
  from portage.package.ebuild.prepare_build_dirs import _ensure_log_subdirs
- from portage.util import ensure_dirs, normalize_path
+ from portage.util import apply_permissions, ensure_dirs, normalize_path
 +from portage.const import EPREFIX_LSTRIP
  
  def process(mysettings, key, logentries, fulltext):