← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/smart/message.py

  • Committer: Joe Julian
  • Date: 2010-01-10 02:25:31 UTC
  • mto: (4634.119.7 2.0)
  • mto: This revision was merged to the branch mainline in revision 4959.
  • Revision ID: joe@julianfamily.org-20100110022531-wqk61rsagz8xsiga
https://launchpad.net/bugs/175839
Added MANIFEST.in to allow bdist_rpm to have all the required include files and tools. bdist_rpm will still fail to build correctly on some distributions due to a disttools bug http://bugs.python.org/issue644744

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/smart/message.py
283
283
                    self._protocol_decoder._get_in_buffer()[:10],
284
284
                    self._protocol_decoder.state_accept.__name__)
285
285
            raise errors.ConnectionReset(
286
 
                "please check connectivity and permissions")
 
286
                "Unexpected end of message. "
 
287
                "Please check connectivity and permissions, and report a bug "
 
288
                "if problems persist.")
287
289
        self._protocol_decoder.accept_bytes(bytes)
288
290
 
289
291
    def protocol_error(self, exception):
328
330
        while not self.finished_reading:
329
331
            while self._bytes_parts:
330
332
                bytes_part = self._bytes_parts.popleft()
331
 
                if 'hpss' in debug.debug_flags:
 
333
                if 'hpssdetail' in debug.debug_flags:
332
334
                    mutter('              %d byte part read', len(bytes_part))
333
335
                yield bytes_part
334
336
            self._read_more()
351
353
        raise errors.LockContention('(remote lock)')
352
354
    elif error_name == 'LockFailed':
353
355
        raise errors.LockFailed(*error_args[:2])
 
356
    elif error_name == 'FileExists':
 
357
        raise errors.FileExists(error_args[0])
 
358
    elif error_name == 'NoSuchFile':
 
359
        raise errors.NoSuchFile(error_args[0])
354
360
    else:
355
361
        raise errors.ErrorFromSmartServer(error_tuple)