Rev 17: Support bzr 0.17 for bzr share. in http://people.ubuntu.com/~robertc/baz2.0/plugins/avahi/trunk

[Robert Collins]

At http://people.ubuntu.com/~robertc/baz2.0/plugins/avahi/trunk

------------------------------------------------------------
revno: 17
revision-id: robertc at robertcollins.net-20070710141932-j9ys93nk4boyhpog
parent: robertc at robertcollins.net-20070709075951-n1c54rgpuro58gq5
committer: Robert Collins <robertc at robertcollins.net>
branch nick: trunk
timestamp: Wed 2007-07-11 00:19:32 +1000
message:
  Support bzr 0.17 for bzr share.
modified:
  share.py                       share.py-20070323082617-ua0xkev3o590n4rm-1
=== modified file 'share.py'
--- a/share.py	2007-07-09 07:59:51 +0000
+++ b/share.py	2007-07-10 14:19:32 +0000
@@ -31,6 +31,12 @@
 from bzrlib.transport import get_transport
 from bzrlib.transport.chroot import ChrootServer
 
+try:
+    from errors import InProcessTransport
+except:
+    class InProcessTransport(Exception):
+        pass
+
 
 class AdvertisedBranch:
     def __init__(self, server, path, branch):
@@ -132,7 +138,7 @@
             backing_urls = [self.smart_server.backing_transport.base]
             try:
                 backing_urls.append(self.smart_server.backing_transport.external_url())
-            except errors.InProcessTransport:
+            except InProcessTransport:
                 pass
             for hook in server.SmartTCPServer.hooks['server_stopped']:
                 hook(backing_urls, self.smart_server.get_url())
@@ -204,7 +210,7 @@
         backing_urls = [self.smart_server.backing_transport.base]
         try:
             backing_urls.append(self.smart_server.backing_transport.external_url())
-        except errors.InProcessTransport:
+        except InProcessTransport:
             pass
         for hook in server.SmartTCPServer.hooks['server_started']:
             hook(backing_urls, self.smart_server.get_url())