← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/win32utils.py

  • Committer: Robert Collins
  • Date: 2010-06-21 01:30:45 UTC
  • mfrom: (5309 +trunk)
  • mto: This revision was merged to the branch mainline in revision 5310.
  • Revision ID: robertc@robertcollins.net-20100621013045-s59nfjps3rkcn53j
Merge trunk to fix NEWS sections.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/win32utils.py
568
568
                if argv[idx][:1] != '-':
569
569
                    break
570
570
            argv = argv[idx+1:]
 
571
        # we should remove '--profile-imports' option as well (bug #588277)
 
572
        # see bzr script ~ line 54
 
573
        if '--profile-imports' in argv and '--profile-imports' not in sys.argv:
 
574
            argv.remove('--profile-imports')
571
575
        return argv
572
576
else:
573
577
    get_unicode_argv = None