/brz/remove-bazaar

To get this branch, use:
bzr branch http://gegoxaren.bato24.eu/bzr/brz/remove-bazaar

« back to all changes in this revision

Viewing changes to bzrlib/win32utils.py

  • Committer: Canonical.com Patch Queue Manager
  • Date: 2010-06-15 04:32:49 UTC
  • mfrom: (5254.2.5 534787-pull-lp-in-config)
  • Revision ID: pqm@pqm.ubuntu.com-20100615043249-b5xx4yeyfyfbfyav
(spiv) Fix 'bzr pull' when lp: URL explicitly defined in
        locations.conf or branch.conf. (Gordon Tyler, #534787)

Show diffs side-by-side

added added

removed removed

Lines of Context:
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