diff options
| author | Zac Medico <zmedico@gentoo.org> | 2008-07-16 01:15:18 +0000 |
|---|---|---|
| committer | Zac Medico <zmedico@gentoo.org> | 2008-07-16 01:15:18 +0000 |
| commit | 11b0b22be712281ec6a15db5fc02373a4649a26a (patch) | |
| tree | 364a00144ea15ec52a64748cde2d130cda7fe424 | |
| parent | bc70c60c1d234de6b88dd0be061a8a152fa47cb7 (diff) | |
| download | portage-11b0b22be712281ec6a15db5fc02373a4649a26a.tar.gz portage-11b0b22be712281ec6a15db5fc02373a4649a26a.tar.bz2 portage-11b0b22be712281ec6a15db5fc02373a4649a26a.zip | |
Make dblink._display_merge() detect scheduler presence internally.
svn path=/main/trunk/; revision=11067
| -rw-r--r-- | pym/portage/dbapi/vartree.py | 12 |
1 files changed, 6 insertions, 6 deletions
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") |