~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/osutils.py

  • Committer: Martin Pool
  • Date: 2009-07-29 04:33:44 UTC
  • mto: This revision was merged to the branch mainline in revision 4688.
  • Revision ID: mbp@sourcefrog.net-20090729043344-oktumz4b3lcdow2k
More warnings when failing to load extensions

Show diffs side-by-side

added added

removed removed

Lines of Context:
1501
1501
            try:
1502
1502
                from bzrlib._readdir_pyx import UTF8DirReader
1503
1503
                _selected_dir_reader = UTF8DirReader()
1504
 
            except ImportError:
 
1504
            except ImportError, e:
 
1505
                _failed_to_load_extension(e)
1505
1506
                pass
1506
1507
 
1507
1508
    if _selected_dir_reader is None:
1813
1814
        try:
1814
1815
            from bzrlib._readdir_pyx import UTF8DirReader
1815
1816
            file_kind_from_stat_mode = UTF8DirReader().kind_from_mode
1816
 
        except ImportError:
 
1817
        except ImportError, e:
 
1818
            _failed_to_load_extension(e)
1817
1819
            from bzrlib._readdir_py import (
1818
1820
                _kind_from_mode as file_kind_from_stat_mode
1819
1821
                )