Pass the whole dblink instance into Scheduler._dblink_display_merge() in case

it's ever needed.

svn path=/main/trunk/; revision=11069

diff --git a/pym/_emerge/__init__.py b/pym/_emerge/__init__.py
index 1aafd64d948f2c7c4b9e514b2bed6389109d8c8e..abcfc8ac5251a3cdba6e473e655ebb10ff5e9f06 100644 (file)
--- 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 f730a21518aa5c72f71ad13580715f89b3e00920..d7cc85027e65f61df781cdc9586e163fbac851ff 100644 (file)
--- 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: