From 11b0b22be712281ec6a15db5fc02373a4649a26a Mon Sep 17 00:00:00 2001 From: Zac Medico Date: Wed, 16 Jul 2008 01:15:18 +0000 Subject: Make dblink._display_merge() detect scheduler presence internally. svn path=/main/trunk/; revision=11067 --- pym/portage/dbapi/vartree.py | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'pym') diff --git a/pym/portage/dbapi/vartree.py b/pym/portage/dbapi/vartree.py index 49b7442a6..724e00ef8 100644 --- a/pym/portage/dbapi/vartree.py +++ b/pym/portage/dbapi/vartree.py @@ -1740,6 +1740,11 @@ class dblink(object): return os.EX_OK def _display_merge(self, msg, level=0): + if self._scheduler is not None: + self._scheduler.dblinkDisplayMerge( + self.settings, msg, level=level) + return + if level >= logging.WARNING: noiselevel = -1 msg_func = writemsg @@ -1761,12 +1766,7 @@ class dblink(object): @rtype: None """ - if self._scheduler is None: - showMessage = self._display_merge - else: - def showMessage(msg, level=0): - self._scheduler.dblinkDisplayMerge( - self.settings, msg, level=level) + showMessage = self._display_merge if not pkgfiles: showMessage("No package files given... Grabbing a set.\n") -- cgit v1.2.3-1-g7c22