From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from pigeon.gentoo.org ([208.92.234.80] helo=lists.gentoo.org) by finch.gentoo.org with esmtp (Exim 4.60) (envelope-from <gentoo-commits+bounces-374210-garchives=archives.gentoo.org@lists.gentoo.org>) id 1Quph6-0005O9-UR for garchives@archives.gentoo.org; Sat, 20 Aug 2011 17:50:53 +0000 Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id F0B2321C066; Sat, 20 Aug 2011 17:50:45 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id BEEEF21C066 for <gentoo-commits@lists.gentoo.org>; Sat, 20 Aug 2011 17:50:45 +0000 (UTC) Received: from pelican.gentoo.org (unknown [66.219.59.40]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 3EA911B404F for <gentoo-commits@lists.gentoo.org>; Sat, 20 Aug 2011 17:50:45 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by pelican.gentoo.org (Postfix) with ESMTP id 94E3980040 for <gentoo-commits@lists.gentoo.org>; Sat, 20 Aug 2011 17:50:44 +0000 (UTC) From: "Fabian Groffen" <grobian@gentoo.org> To: gentoo-commits@lists.gentoo.org Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Fabian Groffen" <grobian@gentoo.org> Message-ID: <7c8aa70f94de389fa452bbc8147de21a1e19a6cb.grobian@gentoo> Subject: [gentoo-commits] proj/portage:prefix commit in: / X-VCS-Repository: proj/portage X-VCS-Committer: grobian X-VCS-Committer-Name: Fabian Groffen X-VCS-Revision: 7c8aa70f94de389fa452bbc8147de21a1e19a6cb Date: Sat, 20 Aug 2011 17:50:44 +0000 (UTC) Precedence: bulk List-Post: <mailto:gentoo-commits@lists.gentoo.org> List-Help: <mailto:gentoo-commits+help@lists.gentoo.org> List-Unsubscribe: <mailto:gentoo-commits+unsubscribe@lists.gentoo.org> List-Subscribe: <mailto:gentoo-commits+subscribe@lists.gentoo.org> List-Id: Gentoo Linux mail <gentoo-commits.gentoo.org> X-BeenThere: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: quoted-printable X-Archives-Salt: X-Archives-Hash: 8a72337c8fe418f813187f55ae8290ad commit: 7c8aa70f94de389fa452bbc8147de21a1e19a6cb Author: Fabian Groffen <grobian <AT> gentoo <DOT> org> AuthorDate: Sat Aug 20 17:50:06 2011 +0000 Commit: Fabian Groffen <grobian <AT> gentoo <DOT> org> CommitDate: Sat Aug 20 17:50:06 2011 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=3Dproj/portage.git;a= =3Dcommit;h=3D7c8aa70f Merge remote-tracking branch 'overlays-gentoo-org/master' into prefix Conflicts: pym/portage/elog/mod_save.py bin/ebuild.sh | 4 +- bin/egencache | 9 + bin/portageq | 62 +++++-- bin/repoman | 25 +++ man/egencache.1 | 4 + man/portage.5 | 1 + man/repoman.1 | 3 + pym/_emerge/Package.py | 6 - pym/_emerge/Scheduler.py | 7 + pym/_emerge/actions.py | 91 +++++----- pym/_emerge/depgraph.py | 14 +- pym/_emerge/main.py | 16 +- pym/_emerge/resolver/output.py | 9 +- pym/_emerge/search.py | 26 ++- pym/portage/dbapi/porttree.py | 5 - pym/portage/dbapi/vartree.py | 198 ++++++++++++++= ++++-- pym/portage/elog/mod_save.py | 25 +++- pym/portage/elog/mod_save_summary.py | 18 ++- .../package/ebuild/_config/special_env_vars.py | 2 +- pym/portage/package/ebuild/config.py | 16 ++- pym/portage/package/ebuild/doebuild.py | 27 +++- pym/portage/package/ebuild/fetch.py | 11 +- pym/portage/package/ebuild/getmaskingstatus.py | 4 - pym/portage/package/ebuild/prepare_build_dirs.py | 17 ++- pym/portage/repository/config.py | 2 +- pym/repoman/checks.py | 2 +- 26 files changed, 478 insertions(+), 126 deletions(-) diff --cc pym/portage/elog/mod_save.py index d1c9bb8,091bbf8..7f97182 --- 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_subdi= rs - from portage.util import ensure_dirs, normalize_path + from portage.util import apply_permissions, ensure_dirs, normalize_path +from portage.const import EPREFIX_LSTRIP =20 def process(mysettings, key, logentries, fulltext): =20