~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/transport/ssh.py

  • Committer: Martin Packman
  • Date: 2012-01-05 10:37:58 UTC
  • mto: This revision was merged to the branch mainline in revision 6427.
  • Revision ID: martin.packman@canonical.com-20120105103758-wzftnmsip5iv9n2g
Revert addition of get_message_encoding function

Show diffs side-by-side

added added

removed removed

Lines of Context:
352
352
class SubprocessVendor(SSHVendor):
353
353
    """Abstract base class for vendors that use pipes to a subprocess."""
354
354
 
 
355
    # In general stderr should be inherited from the parent process so prompts
 
356
    # are visible on the terminal. This can be overriden to another file for
 
357
    # tests, but beware of using PIPE which may hang due to not being read.
 
358
    _stderr_target = None
 
359
 
355
360
    def _connect(self, argv):
356
361
        # Attempt to make a socketpair to use as stdin/stdout for the SSH
357
362
        # subprocess.  We prefer sockets to pipes because they support
368
373
        else:
369
374
            stdin = stdout = subproc_sock
370
375
        proc = subprocess.Popen(argv, stdin=stdin, stdout=stdout,
 
376
                                stderr=self._stderr_target,
371
377
                                **os_specific_subprocess_params())
372
378
        if subproc_sock is not None:
373
379
            subproc_sock.close()