diff options
| author | Zac Medico <zmedico@gentoo.org> | 2011-06-05 19:24:29 -0700 |
|---|---|---|
| committer | Zac Medico <zmedico@gentoo.org> | 2011-06-05 19:24:29 -0700 |
| commit | e717c4429dc00950a8e5840ecce8b4b6fce2d059 (patch) | |
| tree | 6b558917ef229ed1cfab99682e1974d27383d0b6 | |
| parent | d90686c6b2dff96b883f6e1038e228d2b8351660 (diff) | |
| download | portage-e717c4429dc00950a8e5840ecce8b4b6fce2d059.tar.gz portage-e717c4429dc00950a8e5840ecce8b4b6fce2d059.tar.bz2 portage-e717c4429dc00950a8e5840ecce8b4b6fce2d059.zip | |
Scheduler: init _fetch_log in constructor
This ensures that we account for EMERGE_LOG_DIR.
| -rw-r--r-- | 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 bdc13aa85..c3752c54f 100644 --- a/pym/_emerge/Scheduler.py +++ b/pym/_emerge/Scheduler.py @@ -34,6 +34,7 @@ from portage.package.ebuild.digestcheck import digestcheck from portage.package.ebuild.digestgen import digestgen from portage.package.ebuild.prepare_build_dirs import prepare_build_dirs +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_runtime_deps from _emerge._flush_elog_mod_echo import _flush_elog_mod_echo @@ -83,8 +84,6 @@ class Scheduler(PollScheduler): _bad_resume_opts = set(["--ask", "--changelog", "--resume", "--skipfirst"]) - _fetch_log = os.path.join(_emerge_log_dir, 'emerge-fetch.log') - class _iface_class(SlotObject): __slots__ = ("fetch", "output", "register", "schedule", @@ -216,6 +215,8 @@ class Scheduler(PollScheduler): for root in self.trees: self._config_pool[root] = [] + self._fetch_log = os.path.join(_emerge.emergelog._emerge_log_dir, + 'emerge-fetch.log') fetch_iface = self._fetch_iface_class(log_file=self._fetch_log, schedule=self._schedule_fetch) self._sched_iface = self._iface_class( |