From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) by finch.gentoo.org (Postfix) with ESMTP id 363F1138010 for ; Wed, 12 Sep 2012 18:18:33 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 0F9BCE06C5; Wed, 12 Sep 2012 18:18:25 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id CFD30E06C5 for ; Wed, 12 Sep 2012 18:18:25 +0000 (UTC) Received: from hornbill.gentoo.org (hornbill.gentoo.org [94.100.119.163]) (using TLSv1 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 4382C335DF0 for ; Wed, 12 Sep 2012 18:18:25 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by hornbill.gentoo.org (Postfix) with ESMTP id EE266E543C for ; Wed, 12 Sep 2012 18:18:23 +0000 (UTC) From: "Fabian Groffen" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Fabian Groffen" Message-ID: <1347473869.f0397094c2ed8fe67b96cbc797da99aaac335cca.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: f0397094c2ed8fe67b96cbc797da99aaac335cca X-VCS-Branch: prefix Date: Wed, 12 Sep 2012 18:18:23 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: d6a6a8dc-4dbc-4413-be75-d731b1367d36 X-Archives-Hash: c989ee44296c88d49551a6065db1edb0 commit: f0397094c2ed8fe67b96cbc797da99aaac335cca Author: Fabian Groffen gentoo org> AuthorDate: Wed Sep 12 18:17:49 2012 +0000 Commit: Fabian Groffen gentoo org> CommitDate: Wed Sep 12 18:17:49 2012 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=proj/portage.git;a=commit;h=f0397094 Merge remote-tracking branch 'overlays-gentoo-org/master' into prefix Conflicts: pym/portage/data.py bin/egencache | 3 +- bin/phase-functions.sh | 14 +- bin/phase-helpers.sh | 12 +- bin/repoman | 156 ++++++++++++-------- bin/save-ebuild-env.sh | 6 +- cnf/make.conf | 2 +- doc/package/ebuild/eapi/5.docbook | 68 +++------ man/emerge.1 | 13 +- man/make.conf.5 | 4 +- man/portage.5 | 20 ++-- pym/_emerge/EbuildPhase.py | 5 +- pym/_emerge/Scheduler.py | 5 +- pym/_emerge/depgraph.py | 14 ++- pym/portage/__init__.py | 44 ++++-- pym/portage/checksum.py | 17 ++- pym/portage/const.py | 2 +- pym/portage/data.py | 23 ++- .../package/ebuild/_config/LocationsManager.py | 2 +- pym/portage/package/ebuild/config.py | 2 +- pym/portage/package/ebuild/doebuild.py | 7 +- pym/portage/proxy/objectproxy.py | 9 +- pym/portage/tests/lint/test_bash_syntax.py | 16 ++- pym/portage/tests/lint/test_import_modules.py | 2 +- pym/portage/util/__init__.py | 21 ++- pym/portage/util/_desktop_entry.py | 57 +------- pym/portage/xml/metadata.py | 9 +- pym/repoman/herdbase.py | 5 +- pym/repoman/utilities.py | 34 +++-- 28 files changed, 312 insertions(+), 260 deletions(-) diff --cc pym/portage/data.py index 23734f4,b922ff8..df87b5c --- a/pym/portage/data.py +++ b/pym/portage/data.py @@@ -1,9 -1,8 +1,9 @@@ # data.py -- Calculated/Discovered Data Values - # Copyright 1998-2011 Gentoo Foundation + # Copyright 1998-2012 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 - import os, pwd, grp, platform + import os, pwd, grp, platform, sys +from portage.const import PORTAGE_GROUPNAME, PORTAGE_USERNAME, EPREFIX import portage portage.proxy.lazyimport.lazyimport(globals(),