← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/smart/server.py

  • Committer: Vincent Ladeuil
  • Date: 2011-01-27 15:58:36 UTC
  • mfrom: (5609.2.5 2.3)
  • mto: This revision was merged to the branch mainline in revision 5635.
  • Revision ID: v.ladeuil+lp@free.fr-20110127155836-hoyxs53z42jh3ezm
Merge 2.3 into trunk

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/smart/server.py
26
26
from bzrlib import (
27
27
    errors,
28
28
    trace,
 
29
    transport as _mod_transport,
29
30
)
30
31
from bzrlib.lazy_import import lazy_import
31
32
lazy_import(globals(), """
32
33
from bzrlib.smart import medium
33
34
from bzrlib.transport import (
34
35
    chroot,
35
 
    get_transport,
36
36
    pathfilter,
37
37
    )
38
38
from bzrlib import (
325
325
        chroot_server = chroot.ChrootServer(transport)
326
326
        chroot_server.start_server()
327
327
        self.cleanups.append(chroot_server.stop_server)
328
 
        transport = get_transport(chroot_server.get_url())
 
328
        transport = _mod_transport.get_transport(chroot_server.get_url())
329
329
        if self.base_path is not None:
330
330
            # Decorate the server's backing transport with a filter that can
331
331
            # expand homedirs.
332
332
            expand_userdirs = self._make_expand_userdirs_filter(transport)
333
333
            expand_userdirs.start_server()
334
334
            self.cleanups.append(expand_userdirs.stop_server)
335
 
            transport = get_transport(expand_userdirs.get_url())
 
335
            transport = _mod_transport.get_transport(expand_userdirs.get_url())
336
336
        self.transport = transport
337
337
 
338
338
    def _make_smart_server(self, host, port, inet):