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 1QTPUs-0008Ch-Fu for garchives@archives.gentoo.org; Mon, 06 Jun 2011 02:24:54 +0000 Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 4A5831C040; Mon, 6 Jun 2011 02:24:45 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id 1E5681C040 for ; Mon, 6 Jun 2011 02:24: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 9371A1B4017 for ; Mon, 6 Jun 2011 02:24:44 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by pelican.gentoo.org (Postfix) with ESMTP id C9F958003C for ; Mon, 6 Jun 2011 02:24:43 +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: pym/_emerge/ X-VCS-Repository: proj/portage X-VCS-Files: pym/_emerge/Scheduler.py X-VCS-Directories: pym/_emerge/ X-VCS-Committer: zmedico X-VCS-Committer-Name: Zac Medico X-VCS-Revision: e717c4429dc00950a8e5840ecce8b4b6fce2d059 Date: Mon, 6 Jun 2011 02:24:43 +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: X-Archives-Hash: 7fb2fde3e7f71ba5b624152b5afec0ee commit: e717c4429dc00950a8e5840ecce8b4b6fce2d059 Author: Zac Medico gentoo org> AuthorDate: Mon Jun 6 02:24:29 2011 +0000 Commit: Zac Medico gentoo org> CommitDate: Mon Jun 6 02:24:29 2011 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=3Dproj/portage.git;a= =3Dcommit;h=3De717c442 Scheduler: init _fetch_log in constructor This ensures that we account for EMERGE_LOG_DIR. --- pym/_emerge/Scheduler.py | 7 ++++--- 1 files changed, 4 insertions(+), 3 deletions(-) diff --git a/pym/_emerge/Scheduler.py b/pym/_emerge/Scheduler.py index bdc13aa..c3752c5 100644 --- a/pym/_emerge/Scheduler.py +++ b/pym/_emerge/Scheduler.py @@ -34,6 +34,7 @@ from portage.package.ebuild.digestcheck import digestch= eck from portage.package.ebuild.digestgen import digestgen from portage.package.ebuild.prepare_build_dirs import prepare_build_dirs =20 +import _emerge from _emerge.BinpkgFetcher import BinpkgFetcher from _emerge.BinpkgPrefetcher import BinpkgPrefetcher from _emerge.BinpkgVerifier import BinpkgVerifier @@ -46,7 +47,7 @@ from _emerge.DepPriority import DepPriority from _emerge.depgraph import depgraph, resume_depgraph from _emerge.EbuildFetcher import EbuildFetcher from _emerge.EbuildPhase import EbuildPhase -from _emerge.emergelog import emergelog, _emerge_log_dir +from _emerge.emergelog import emergelog from _emerge.FakeVartree import FakeVartree from _emerge._find_deep_system_runtime_deps import _find_deep_system_run= time_deps from _emerge._flush_elog_mod_echo import _flush_elog_mod_echo @@ -83,8 +84,6 @@ class Scheduler(PollScheduler): _bad_resume_opts =3D set(["--ask", "--changelog", "--resume", "--skipfirst"]) =20 - _fetch_log =3D os.path.join(_emerge_log_dir, 'emerge-fetch.log') - class _iface_class(SlotObject): __slots__ =3D ("fetch", "output", "register", "schedule", @@ -216,6 +215,8 @@ class Scheduler(PollScheduler): for root in self.trees: self._config_pool[root] =3D [] =20 + self._fetch_log =3D os.path.join(_emerge.emergelog._emerge_log_dir, + 'emerge-fetch.log') fetch_iface =3D self._fetch_iface_class(log_file=3Dself._fetch_log, schedule=3Dself._schedule_fetch) self._sched_iface =3D self._iface_class(