← Back to branch summary

~mthaddon/bzr/trunk

« back to all changes in this revision

Viewing changes to bzrlib/smart/server.py

  • Committer: Canonical.com Patch Queue Manager
  • Date: 2011-07-25 14:01:28 UTC
  • mfrom: (6039.1.9 transport-from-url)
  • Revision ID: pqm@pqm.ubuntu.com-20110725140128-croovh96z0rs57yy
(jelmer) Add get_transport_from_url and get_transport_from_path functions.
 (Jelmer Vernooij)

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/smart/server.py
330
330
        chroot_server = chroot.ChrootServer(transport)
331
331
        chroot_server.start_server()
332
332
        self.cleanups.append(chroot_server.stop_server)
333
 
        transport = _mod_transport.get_transport(chroot_server.get_url())
 
333
        transport = _mod_transport.get_transport_from_url(chroot_server.get_url())
334
334
        if self.base_path is not None:
335
335
            # Decorate the server's backing transport with a filter that can
336
336
            # expand homedirs.
337
337
            expand_userdirs = self._make_expand_userdirs_filter(transport)
338
338
            expand_userdirs.start_server()
339
339
            self.cleanups.append(expand_userdirs.stop_server)
340
 
            transport = _mod_transport.get_transport(expand_userdirs.get_url())
 
340
            transport = _mod_transport.get_transport_from_url(expand_userdirs.get_url())
341
341
        self.transport = transport
342
342
 
343
343
    def _make_smart_server(self, host, port, inet):