Rev 5485: (vila) Fix PATH in start_bzr.bat (Matthäus G. Chajdas) in file:///home/pqm/archives/thelove/bzr/%2Btrunk/

[Canonical.com Patch Queue Manager]

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

------------------------------------------------------------
revno: 5485 [merge]
revision-id: pqm at pqm.ubuntu.com-20101012071750-jmll5mzcfetskkb2
parent: pqm at pqm.ubuntu.com-20101012005649-ztnfgo1vqxbomj3v
parent: v.ladeuil+lp at free.fr-20101012061854-r8aq5q94vgka6om0
committer: Canonical.com Patch Queue Manager <pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Tue 2010-10-12 08:17:50 +0100
message:
  (vila) Fix PATH in start_bzr.bat (Matthäus G. Chajdas)
modified:
  NEWS                           NEWS-20050323055033-4e00b5db738777ff
  tools/win32/bzr_postinstall.py bzr_postinstall.py-20060622100836-b3yup582rt3y0nvm-6
  tools/win32/start_bzr.bat      start_bzr.bat-20060622100836-b3yup582rt3y0nvm-9
=== modified file 'NEWS'
--- a/NEWS	2010-10-11 23:54:01 +0000
+++ b/NEWS	2010-10-12 06:18:54 +0000
@@ -23,6 +23,8 @@
 Bug Fixes
 *********
 
+* Always set PATH in start_bzr.bat on Windows. (Matthäus G. Chajdas, #470264)
+
 * Don't force openssh to use protocol=2, since that is now the default.
   (Neil Martinsen-Burrell, #561061)
 

=== modified file 'tools/win32/bzr_postinstall.py'
--- a/tools/win32/bzr_postinstall.py	2010-02-04 16:06:36 +0000
+++ b/tools/win32/bzr_postinstall.py	2010-10-12 01:18:01 +0000
@@ -173,6 +173,9 @@
                 content[ix] = s.replace('bzr.exe',
                                         '"%s"' % os.path.join(bzr_dir,
                                                               'bzr.exe'))
+            elif s.find(r'C:\Program Files\Bazaar') != -1:
+                content[ix] = s.replace(r'C:\Program Files\Bazaar',
+                                        bzr_dir)
 
         if dry_run:
             print "*** Write file: start_bzr.bat"

=== modified file 'tools/win32/start_bzr.bat'
--- a/tools/win32/start_bzr.bat	2007-01-30 23:05:35 +0000
+++ b/tools/win32/start_bzr.bat	2010-10-09 18:18:19 +0000
@@ -5,9 +5,8 @@
 REM    **  that affects on bzr behaviour                   **
 REM    ******************************************************
 
-REM If you don't add Bzr directory to system-wide PATH environment variable
-REM you can modify local PATH
-REM SET PATH=C:\Program Files\Bazaar;%PATH%
+REM Add the Bzr directory to system-wide PATH environment variable
+SET PATH=C:\Program Files\Bazaar;%PATH%
 
 REM Change next line to set-up e-mail to identify yourself in bzr
 REM SET BZREMAIL=
@@ -28,4 +27,4 @@
 REM --------------------------------------------------------------------------
 
 @ECHO ON
- at bzr.exe help
\ No newline at end of file
+ at bzr.exe help