← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/osutils.py

  • Committer: Vincent Ladeuil
  • Date: 2009-04-06 08:17:53 UTC
  • mto: (4241.10.1 bzr.1.14)
  • mto: This revision was merged to the branch mainline in revision 4267.
  • Revision ID: v.ladeuil+lp@free.fr-20090406081753-7kgr5pcn218zavf4
Fix most of cicp related failures on OSX.

* bzrlib/tests/blackbox/test_filesystem_cicp.py:
Fix forgotten s/added/adding/.

* bzrlib/osutils.py:
(_cicp_canonical_relpath): Should be used for Darwin too according
to tests.CaseInsCasePresFilenameFeature.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/osutils.py
1033
1033
# file-systems; Linux often sees FAT32 devices, for example, so could
1034
1034
# probably benefit from the same basic support there.  For now though, only
1035
1035
# Windows gets that support, and it gets it for *all* file-systems!
1036
 
if sys.platform == "win32":
 
1036
if sys.platform in ('win32', 'darwin'):
1037
1037
    canonical_relpath = _cicp_canonical_relpath
1038
1038
else:
1039
1039
    canonical_relpath = relpath