Rev 5276: (lifeless) Explicitly removing ``--profile-imports`` option from parsed in file:///home/pqm/archives/thelove/bzr/%2Btrunk/

[Canonical.com Patch Queue Manager]

At file:///home/pqm/archives/thelove/bzr/%2Btrunk/

------------------------------------------------------------
revno: 5276 [merge]
revision-id: pqm at pqm.ubuntu.com-20100601224623-bdsqp9mwnq4ehwq5
parent: pqm at pqm.ubuntu.com-20100601212820-0h5modtetq6efk90
parent: bialix at ukr.net-20100601142401-vqaatwrponmp4r59
committer: Canonical.com Patch Queue Manager <pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Tue 2010-06-01 23:46:23 +0100
message:
  (lifeless) Explicitly removing ``--profile-imports`` option from parsed
   command-line arguments on Windows, because bzr script does the same. (bialix,
   #588277) (Alexander Belchenko)
modified:
  NEWS                           NEWS-20050323055033-4e00b5db738777ff
  bzrlib/win32utils.py           win32console.py-20051021033308-123c6c929d04973d
=== modified file 'NEWS'
--- a/NEWS	2010-05-31 21:38:46 +0000
+++ b/NEWS	2010-06-01 14:09:27 +0000
@@ -25,6 +25,10 @@
   test that all commands available to the test suite have help.
   (Robert Collins, #177500)
 
+* Explicitly removing ``--profile-imports`` option from parsed command-line
+  arguments on Windows, because bzr script does the same.
+  (Alexander Belchenko, #588277)
+
 Improvements
 ************
 

=== modified file 'bzrlib/win32utils.py'
--- a/bzrlib/win32utils.py	2010-05-20 02:57:52 +0000
+++ b/bzrlib/win32utils.py	2010-06-01 14:24:01 +0000
@@ -568,6 +568,10 @@
                 if argv[idx][:1] != '-':
                     break
             argv = argv[idx+1:]
+        # we should remove '--profile-imports' option as well (bug #588277)
+        # see bzr script ~ line 54
+        if '--profile-imports' in argv and '--profile-imports' not in sys.argv:
+            argv.remove('--profile-imports')
         return argv
 else:
     get_unicode_argv = None