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 ) id 1RZRvZ-0005ce-9O for garchives@archives.gentoo.org; Sat, 10 Dec 2011 18:45:41 +0000 Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id DF6E321C070; Sat, 10 Dec 2011 18:45:33 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id 9687F21C070 for ; Sat, 10 Dec 2011 18:45:33 +0000 (UTC) Received: from pelican.gentoo.org (unknown [66.219.59.40]) (using TLSv1 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 17BDF1B4008 for ; Sat, 10 Dec 2011 18:45:33 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by pelican.gentoo.org (Postfix) with ESMTP id 67BDE80042 for ; Sat, 10 Dec 2011 18:45:32 +0000 (UTC) From: "Zac Medico" To: gentoo-commits@lists.gentoo.org Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Zac Medico" Message-ID: Subject: [gentoo-commits] proj/portage:master commit in: bin/ X-VCS-Repository: proj/portage X-VCS-Files: bin/egencache bin/repoman X-VCS-Directories: bin/ X-VCS-Committer: zmedico X-VCS-Committer-Name: Zac Medico X-VCS-Revision: c37d0c55ac3f70586afcad86636973de35eabe4e Date: Sat, 10 Dec 2011 18:45:32 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: quoted-printable X-Archives-Salt: 4e29f635-1504-4dc5-b6cd-4451c969beca X-Archives-Hash: 774ebee000934b37e91536d65c1c1854 commit: c37d0c55ac3f70586afcad86636973de35eabe4e Author: Zac Medico gentoo org> AuthorDate: Sat Dec 10 18:45:20 2011 +0000 Commit: Zac Medico gentoo org> CommitDate: Sat Dec 10 18:45:20 2011 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=3Dproj/portage.git;a= =3Dcommit;h=3Dc37d0c55 Remove redundant eprefix in config constructors. Since commit 11a7448f1d5a0bfb38f8de9d66a8fa8d7118c877, the config constructor uses portage.const.EPREFIX by default. --- bin/egencache | 6 ++---- bin/repoman | 9 ++++----- 2 files changed, 6 insertions(+), 9 deletions(-) diff --git a/bin/egencache b/bin/egencache index 6d18f66..7a87bb6 100755 --- a/bin/egencache +++ b/bin/egencache @@ -841,10 +841,8 @@ def egencache_main(args): if options.portdir is not None: env['PORTDIR'] =3D options.portdir =20 - eprefix =3D portage.const.EPREFIX - settings =3D portage.config(config_root=3Dconfig_root, - local_config=3DFalse, env=3Denv, eprefix=3Deprefix) + local_config=3DFalse, env=3Denv) =20 default_opts =3D None if not options.ignore_default_opts: @@ -857,7 +855,7 @@ def egencache_main(args): env['PORTAGE_DEPCACHEDIR'] =3D options.cache_dir =20 settings =3D portage.config(config_root=3Dconfig_root, - local_config=3DFalse, env=3Denv, eprefix=3Deprefix) + local_config=3DFalse, env=3Denv) =20 if not options.update and not options.update_use_local_desc \ and not options.update_changelogs: diff --git a/bin/repoman b/bin/repoman index 24e8f77..43270f9 100755 --- a/bin/repoman +++ b/bin/repoman @@ -95,8 +95,7 @@ os.umask(0o22) # behave incrementally. repoman_incrementals =3D tuple(x for x in \ portage.const.INCREMENTALS if x !=3D 'ACCEPT_KEYWORDS') -eprefix =3D portage.const.EPREFIX -repoman_settings =3D portage.config(local_config=3DFalse, eprefix=3Depre= fix) +repoman_settings =3D portage.config(local_config=3DFalse) repoman_settings.lock() =20 if repoman_settings.get("NOCOLOR", "").lower() in ("yes", "true") or \ @@ -565,13 +564,13 @@ if options.mode =3D=3D 'commit' and not options.pre= tend and not vcs: options.pretend =3D True =20 # Ensure that PORTDIR_OVERLAY contains the repository corresponding to $= PWD. -repoman_settings =3D portage.config(local_config=3DFalse, eprefix=3Depre= fix) +repoman_settings =3D portage.config(local_config=3DFalse) repoman_settings['PORTDIR_OVERLAY'] =3D "%s %s" % \ (repoman_settings.get('PORTDIR_OVERLAY', ''), portage._shell_quote(portdir_overlay)) # We have to call the config constructor again so # that config.repositories is initialized correctly. -repoman_settings =3D portage.config(local_config=3DFalse, eprefix=3Depre= fix, +repoman_settings =3D portage.config(local_config=3DFalse, env=3Ddict(os.environ, PORTDIR_OVERLAY=3Drepoman_settings['PORTDIR_OVER= LAY'])) =20 root =3D repoman_settings['EROOT'] @@ -2005,7 +2004,7 @@ for x in effective_scanlist: config_incrementals=3Drepoman_incrementals, local_config=3DFalse, _unmatched_removal=3Doptions.unmatched_removal, - env=3Denv, eprefix=3Deprefix) + env=3Denv) dep_settings.categories =3D repoman_settings.categories if options.without_mask: dep_settings._mask_manager =3D \