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-350506-garchives=archives.gentoo.org@lists.gentoo.org>)
id 1QShrT-00084i-GY
for garchives@archives.gentoo.org; Sat, 04 Jun 2011 03:49:19 +0000
Received: from pigeon.gentoo.org (localhost [127.0.0.1])
by pigeon.gentoo.org (Postfix) with SMTP id 95A631C03A;
Sat, 4 Jun 2011 03:49:12 +0000 (UTC)
Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183])
by pigeon.gentoo.org (Postfix) with ESMTP id 62EF31C03A
for <gentoo-commits@lists.gentoo.org>; Sat, 4 Jun 2011 03:49:12 +0000 (UTC)
Received: from pelican.gentoo.org (unknown [66.219.59.40])
(using TLSv1 with cipher ADH-CAMELLIA256-SHA (256/256 bits))
(No client certificate requested)
by smtp.gentoo.org (Postfix) with ESMTPS id BC64F1BC002
for <gentoo-commits@lists.gentoo.org>; Sat, 4 Jun 2011 03:49:11 +0000 (UTC)
Received: from localhost.localdomain (localhost [127.0.0.1])
by pelican.gentoo.org (Postfix) with ESMTP id 36D8980506
for <gentoo-commits@lists.gentoo.org>; Sat, 4 Jun 2011 03:49:11 +0000 (UTC)
From: "Zac Medico" <zmedico@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Content-type: text/plain; charset=UTF-8
Reply-To: gentoo-dev@lists.gentoo.org, "Zac Medico" <zmedico@gentoo.org>
Message-ID: <d8c6671a94107067b6a288e9209c0536817c7687.zmedico@gentoo>
Subject: [gentoo-commits] proj/portage:master commit in: pym/_emerge/
X-VCS-Repository: proj/portage
X-VCS-Files: pym/_emerge/Binpkg.py
X-VCS-Directories: pym/_emerge/
X-VCS-Committer: zmedico
X-VCS-Committer-Name: Zac Medico
X-VCS-Revision: d8c6671a94107067b6a288e9209c0536817c7687
Date: Sat, 4 Jun 2011 03:49:11 +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: e350add61f838dc531451e51279c82dd
commit: d8c6671a94107067b6a288e9209c0536817c7687
Author: Zac Medico <zmedico <AT> gentoo <DOT> org>
AuthorDate: Sat Jun 4 03:48:55 2011 +0000
Commit: Zac Medico <zmedico <AT> gentoo <DOT> org>
CommitDate: Sat Jun 4 03:48:55 2011 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=3Dproj/portage.git;a=
=3Dcommit;h=3Dd8c6671a
Binpkg: cleanup PORTAGE_BINPKG_FILE code
---
pym/_emerge/Binpkg.py | 22 ++++++----------------
1 files changed, 6 insertions(+), 16 deletions(-)
diff --git a/pym/_emerge/Binpkg.py b/pym/_emerge/Binpkg.py
index 1ed5c1f..84eda21 100644
--- a/pym/_emerge/Binpkg.py
+++ b/pym/_emerge/Binpkg.py
@@ -114,6 +114,9 @@ class Binpkg(CompositeTask):
pretend=3Dself.opts.pretend, scheduler=3Dself.scheduler)
pkg_path =3D fetcher.pkg_path
self._pkg_path =3D pkg_path
+ # This gives bashrc users an opportunity to do various things
+ # such as remove binary packages after they're installed.
+ self.settings["PORTAGE_BINPKG_FILE"] =3D pkg_path
=20
if self.opts.getbinpkg and self._bintree.isremote(pkg.cpv):
=20
@@ -264,16 +267,9 @@ class Binpkg(CompositeTask):
self.wait()
return
=20
- # This gives bashrc users an opportunity to do various things
- # such as remove binary packages after they're installed.
- settings =3D self.settings
- settings.setcpv(self.pkg)
- settings["PORTAGE_BINPKG_FILE"] =3D self._pkg_path
- settings.backup_changes("PORTAGE_BINPKG_FILE")
-
setup_phase =3D EbuildPhase(background=3Dself.background,
phase=3D"setup", scheduler=3Dself.scheduler,
- settings=3Dsettings)
+ settings=3Dself.settings)
=20
setup_phase.addExitListener(self._setup_exit)
self._task_queued(setup_phase)
@@ -308,18 +304,12 @@ class Binpkg(CompositeTask):
self._build_dir.unlock()
=20
def create_install_task(self):
-
- # This gives bashrc users an opportunity to do various things
- # such as remove binary packages after they're installed.
- settings =3D self.settings
- settings["PORTAGE_BINPKG_FILE"] =3D self._pkg_path
- settings.backup_changes("PORTAGE_BINPKG_FILE")
-
task =3D EbuildMerge(find_blockers=3Dself.find_blockers,
ldpath_mtimes=3Dself.ldpath_mtimes, logger=3Dself.logger,
pkg=3Dself.pkg, pkg_count=3Dself.pkg_count,
pkg_path=3Dself._pkg_path, scheduler=3Dself.scheduler,
- settings=3Dsettings, tree=3Dself._tree, world_atom=3Dself.world_atom)
+ settings=3Dself.settings, tree=3Dself._tree,
+ world_atom=3Dself.world_atom)
task.addExitListener(self._install_exit)
return task
=20