Rev 2490: merge hpss compatibility fix in http://sourcefrog.net/bzr/0.16-release

[Martin Pool]

At http://sourcefrog.net/bzr/0.16-release

------------------------------------------------------------
revno: 2490
revision-id: mbp at sourcefrog.net-20070507131140-iajs5she7cy0pbst
parent: mbp at sourcefrog.net-20070507131058-7yoc6xajos30hjt0
parent: andrew.bennetts at canonical.com-20070430064224-hagj8m0855p1sxn7
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: 0.16-release
timestamp: Mon 2007-05-07 23:11:40 +1000
message:
  merge hpss compatibility fix
modified:
  bzrlib/tests/test_remote.py    test_remote.py-20060720103555-yeeg2x51vn0rbtdp-2
  bzrlib/transport/remote.py     ssh.py-20060608202016-c25gvf1ob7ypbus6-1
    ------------------------------------------------------------
    revno: 2471.2.1
    merged: andrew.bennetts at canonical.com-20070430064224-hagj8m0855p1sxn7
    parent: pqm at pqm.ubuntu.com-20070430054416-kl8x12cim7g45lap
    committer: Andrew Bennetts <andrew.bennetts at canonical.com>
    branch nick: hpss-0.11-compat
    timestamp: Mon 2007-04-30 16:42:24 +1000
    message:
      Fix trivial incompatibility with bzr 0.11 servers, which give a slightly different error to bzr 0.15 servers.
=== modified file 'bzrlib/tests/test_remote.py'
--- a/bzrlib/tests/test_remote.py	2007-05-03 08:00:00 +0000
+++ b/bzrlib/tests/test_remote.py	2007-05-07 13:11:40 +0000
@@ -426,6 +426,20 @@
             [('call', 'Transport.is_readonly', ())],
             client._calls)
 
+    def test_error_from_old_0_11_server(self):
+        """Same as test_error_from_old_server, but with the slightly different
+        error message from bzr 0.11 servers.
+        """
+        client = FakeClient([(
+            ('error', "Generic bzr smart protocol error: "
+                      "bad request u'Transport.is_readonly'"), '')])
+        transport = RemoteTransport('bzr://example.com/', medium=False,
+                                    _client=client)
+        self.assertEqual(False, transport.is_readonly())
+        self.assertEqual(
+            [('call', 'Transport.is_readonly', ())],
+            client._calls)
+
 
 class TestRemoteRepository(tests.TestCase):
     """Base for testing RemoteRepository protocol usage.

=== modified file 'bzrlib/transport/remote.py'
--- a/bzrlib/transport/remote.py	2007-04-30 04:00:06 +0000
+++ b/bzrlib/transport/remote.py	2007-04-30 06:42:24 +0000
@@ -133,8 +133,10 @@
             return True
         elif resp == ('no', ):
             return False
-        elif resp == ('error', "Generic bzr smart protocol error: "
-                               "bad request 'Transport.is_readonly'"):
+        elif (resp == ('error', "Generic bzr smart protocol error: "
+                                "bad request 'Transport.is_readonly'") or
+              resp == ('error', "Generic bzr smart protocol error: "
+                                "bad request u'Transport.is_readonly'")):
             # XXX: nasty hack: servers before 0.16 don't have a
             # 'Transport.is_readonly' verb, so we do what clients before 0.16
             # did: assume False.