← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/transport/remote.py

Merge bzr.dev into cleanup resolving conflicts

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/transport/remote.py
1
 
# Copyright (C) 2006 Canonical Ltd
 
1
# Copyright (C) 2006-2010 Canonical Ltd
2
2
#
3
3
# This program is free software; you can redistribute it and/or modify
4
4
# it under the terms of the GNU General Public License as published by
514
514
        if user is None:
515
515
            auth = config.AuthenticationConfig()
516
516
            user = auth.get_user('ssh', self._host, self._port)
517
 
        client_medium = medium.SmartSSHClientMedium(self._host, self._port,
518
 
            user, self._password, self.base,
519
 
            bzr_remote_path=bzr_remote_path)
 
517
        ssh_params = medium.SSHParams(self._host, self._port, user,
 
518
            self._password, bzr_remote_path)
 
519
        client_medium = medium.SmartSSHClientMedium(self.base, ssh_params)
520
520
        return client_medium, (user, self._password)
521
521
 
522
522