From b05931262c4687360325304b47a44bb6e5760e50 Mon Sep 17 00:00:00 2001 From: Zac Medico Date: Wed, 16 Jul 2008 01:42:42 +0000 Subject: Pass the whole dblink instance into Scheduler._dblink_display_merge() in case it's ever needed. svn path=/main/trunk/; revision=11069 --- pym/_emerge/__init__.py | 4 ++-- pym/portage/dbapi/vartree.py | 3 +-- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/pym/_emerge/__init__.py b/pym/_emerge/__init__.py index 1aafd64d9..abcfc8ac5 100644 --- a/pym/_emerge/__init__.py +++ b/pym/_emerge/__init__.py @@ -8576,8 +8576,8 @@ class Scheduler(PollScheduler): finally: f.close() - def _dblink_display_merge(self, settings, msg, level=0): - log_path = settings.get("PORTAGE_LOG_FILE") + def _dblink_display_merge(self, pkg_dblink, msg, level=0): + log_path = pkg_dblink.settings.get("PORTAGE_LOG_FILE") background = self._max_jobs > 1 if level >= logging.WARNING: diff --git a/pym/portage/dbapi/vartree.py b/pym/portage/dbapi/vartree.py index f730a2151..d7cc85027 100644 --- a/pym/portage/dbapi/vartree.py +++ b/pym/portage/dbapi/vartree.py @@ -1741,8 +1741,7 @@ class dblink(object): def _display_merge(self, msg, level=0): if self._scheduler is not None: - self._scheduler.dblinkDisplayMerge( - self.settings, msg, level=level) + self._scheduler.dblinkDisplayMerge(self, msg, level=level) return if level >= logging.WARNING: -- cgit v1.2.3-1-g7c22