diff options
| author |   Zac Medico <zmedico@gentoo.org> | 2008-07-16 01:42:42 +0000 |
|---|---|---|
| committer | Zac Medico <zmedico@gentoo.org> | 2008-07-16 01:42:42 +0000 |
| commit | b05931262c4687360325304b47a44bb6e5760e50 (patch) | |
| tree | e0e97ed3e4cdf69dce393d799f5168b25b227695 /pym | |
| parent | Redirect dblink.merge() output to the log file when --jobs > 1. (diff) | |
| download | portage-multirepo-b05931262c4687360325304b47a44bb6e5760e50.tar.gz portage-multirepo-b05931262c4687360325304b47a44bb6e5760e50.tar.bz2 portage-multirepo-b05931262c4687360325304b47a44bb6e5760e50.zip | |
Pass the whole dblink instance into Scheduler._dblink_display_merge() in case
it's ever needed.
svn path=/main/trunk/; revision=11069
Diffstat (limited to 'pym')
| -rw-r--r-- | pym/_emerge/__init__.py | 4 | ||||
| -rw-r--r-- | 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 1aafd64d..abcfc8ac 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 f730a215..d7cc8502 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: |