← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/win32utils.py

  • Committer: Alexander Belchenko
  • Date: 2010-06-17 08:53:15 UTC
  • mfrom: (5300 +trunk)
  • mto: (5303.2.1 integration)
  • mto: This revision was merged to the branch mainline in revision 5305.
  • Revision ID: bialix@ukr.net-20100617085315-hr8186zck57zn35s
merge bzr.dev; fix NEWS

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/win32utils.py
21
21
 
22
22
import glob
23
23
import os
24
 
import re
25
24
import struct
26
25
import sys
27
26
 
569
568
                if argv[idx][:1] != '-':
570
569
                    break
571
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')
572
575
        return argv
573
576
else:
574
577
    get_unicode_argv = None