diff options
| author | Zac Medico <zmedico@gentoo.org> | 2010-10-14 19:55:44 -0700 |
|---|---|---|
| committer | Zac Medico <zmedico@gentoo.org> | 2010-10-15 03:05:50 -0700 |
| commit | 8a60f1ffba323d13ab0c7ee6c8ee9c37c6cb1db3 (patch) | |
| tree | ee130005538802a3af7292f95715c74df502494c | |
| parent | 0e37c560d8c1f03d100214a6df5db47391c0709d (diff) | |
| download | portage-8a60f1ffba323d13ab0c7ee6c8ee9c37c6cb1db3.tar.gz portage-8a60f1ffba323d13ab0c7ee6c8ee9c37c6cb1db3.tar.bz2 portage-8a60f1ffba323d13ab0c7ee6c8ee9c37c6cb1db3.zip | |
Fix parallel-fetch output by BinpkgVerifier.
BinpkgVerifier was erroneusly sending parallel-fetch output to stdout.
Thanks to Jeremy Olexa <darkside@g.o> for reporting.
| -rw-r--r-- | pym/_emerge/BinpkgVerifier.py | 3 | ||||
| -rw-r--r-- | pym/_emerge/PollScheduler.py | 10 |
2 files changed, 10 insertions, 3 deletions
diff --git a/pym/_emerge/BinpkgVerifier.py b/pym/_emerge/BinpkgVerifier.py index ed4fc1f74..e787437d0 100644 --- a/pym/_emerge/BinpkgVerifier.py +++ b/pym/_emerge/BinpkgVerifier.py @@ -71,7 +71,8 @@ class BinpkgVerifier(AsynchronousTask): msg = _unicode_decode(out.getvalue(), encoding=_encodings['content'], errors='replace') if msg: - self.scheduler.output(msg, log_path=self.logfile) + self.scheduler.output(msg, log_path=self.logfile, + background=self.background) self.returncode = rval self.wait() diff --git a/pym/_emerge/PollScheduler.py b/pym/_emerge/PollScheduler.py index f9fe32e9a..68826e28e 100644 --- a/pym/_emerge/PollScheduler.py +++ b/pym/_emerge/PollScheduler.py @@ -244,7 +244,8 @@ class PollScheduler(object): return event_handled - def _task_output(self, msg, log_path=None, level=0, noiselevel=-1): + def _task_output(self, msg, log_path=None, background=None, + level=0, noiselevel=-1): """ Output msg to stdout if not self._background. If log_path is not None then append msg to the log (appends with @@ -252,7 +253,12 @@ class PollScheduler(object): corresponds to a supported compression type). """ - if not self._background: + if background is None: + # If the task does not have a local background value + # (like for parallel-fetch), then use the global value. + background = self._background + + if not background: writemsg_level(msg, level=level, noiselevel=noiselevel) if log_path is not None: |