~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/win32utils.py

  • Committer: John Arbash Meinel
  • Date: 2009-11-20 16:42:28 UTC
  • mto: This revision was merged to the branch mainline in revision 4819.
  • Revision ID: john@arbash-meinel.com-20091120164228-aa9agsdfomwzqshc
Fix bug #485771. Only change '/' to '/' when expanding globs.

The code we had would replace '/' even if it was in a quoted section,
or if it was part of a simple argument that didn't have a glob.

Show diffs side-by-side

added added

removed removed

Lines of Context:
631
631
    args = []
632
632
    for is_quoted, arg in s:
633
633
        if is_quoted or not glob.has_magic(arg):
634
 
            args.append(arg.replace(u'\\', u'/'))
 
634
            args.append(arg)
635
635
        else:
636
636
            args.extend(glob_one(arg))
637
637
    return args