Merge lp:~bialix/bzr/588277-profile-imports into lp:bzr

[Alexander Belchenko]

Explicitly removing ``--profile-imports`` option from parsed command-line arguments on Windows, because bzr script does the same. (bialix, #588277)

Explicitly removing ``--profile-imports`` option from parsed command-line arguments on Windows, because bzr script does the same. (Alexander Belchenko, #588277)

[John A Meinel (jameinel)]

-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1

Alexander Belchenko wrote:
> Alexander Belchenko has proposed merging lp:~bialix/bzr/588277-profile-imports into lp:bzr.
>
> Requested reviews:
> bzr-core (bzr-core)
> Related bugs:
> #588277 --profile-imports broken on windows
> https://bugs.launchpad.net/bugs/588277
>
>
> Explicitly removing ``--profile-imports`` option from parsed command-line arguments on Windows, because bzr script does the same. (Alexander Belchenko, #588277)
>

 merge: approve

John
=:->

-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.9 (Cygwin)
Comment: Using GnuPG with Mozilla - http://enigmail.mozdev.org/

iEYEARECAAYFAkwFHqAACgkQJdeBCYSNAAMd3wCfQlWDfYzn40ARvGghRx/C/TY3
QY0AmwYiZqD1SW0UJ0TRBTCfUCrHZnYP
=JLqq
-----END PGP SIGNATURE-----

review: Approve

[Alexander Belchenko (bialix)]

Thank you, John. Now it's time to configure pqm plugin.

[Robert Collins (lifeless)]

sent to pqm by email

=== modified file 'NEWS'
--- NEWS	2010-05-31 21:38:46 +0000
+++ NEWS	2010-06-01 14:25:48 +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'
--- bzrlib/win32utils.py	2010-05-20 02:57:52 +0000
+++ bzrlib/win32utils.py	2010-06-01 14:25:48 +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