/brz/remove-bazaar

To get this branch, use:
bzr branch http://gegoxaren.bato24.eu/bzr/brz/remove-bazaar

« back to all changes in this revision

Viewing changes to bzrlib/transport/ssh.py

  • Committer: Andrew Bennetts
  • Date: 2008-03-27 06:10:18 UTC
  • mfrom: (3309 +trunk)
  • mto: This revision was merged to the branch mainline in revision 3320.
  • Revision ID: andrew.bennetts@canonical.com-20080327061018-dxztpxyv6yoeg3am
Merge from bzr.dev.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/transport/ssh.py
132
132
 
133
133
    def _get_vendor_by_inspection(self):
134
134
        """Return the vendor or None by checking for known SSH implementations."""
135
 
        # detection of plink vendor is disabled because of bug #107593
136
 
        # https://bugs.launchpad.net/bzr/+bug/107593
137
 
        # who want plink should explicitly enable it with BZR_SSH environment
138
 
        # variable.
139
 
        #~for args in (['ssh', '-V'], ['plink', '-V']):
140
 
        for args in (['ssh', '-V'],):
 
135
        for args in (['ssh', '-V'], ['plink', '-V']):
141
136
            version = self._get_ssh_version_string(args)
142
137
            vendor = self._get_vendor_by_version_string(version, args)
143
138
            if vendor is not None:
448
443
        if subsystem is not None:
449
444
            assert command is None, (
450
445
                'subsystem and command are mutually exclusive')
451
 
        args = ['plink', '-x', '-a', '-ssh', '-2']
 
446
        args = ['plink', '-x', '-a', '-ssh', '-2', '-batch']
452
447
        if port is not None:
453
448
            args.extend(['-P', str(port)])
454
449
        if username is not None: