/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 tools/win32/bzr_postinstall.py

  • Committer: John Arbash Meinel
  • Date: 2011-04-22 14:12:22 UTC
  • mfrom: (5809 +trunk)
  • mto: This revision was merged to the branch mainline in revision 5836.
  • Revision ID: john@arbash-meinel.com-20110422141222-nx2j0hbkihcb8j16
Merge newer bzr.dev and resolve conflicts.
Try to write some documentation about how the _dirblock_state works.
Fix up the tests so that they pass again.

Show diffs side-by-side

added added

removed removed

Lines of Context:
tools/win32/bzr_postinstall.py
173
173
                content[ix] = s.replace('bzr.exe',
174
174
                                        '"%s"' % os.path.join(bzr_dir,
175
175
                                                              'bzr.exe'))
 
176
            elif s.find(r'C:\Program Files\Bazaar') != -1:
 
177
                content[ix] = s.replace(r'C:\Program Files\Bazaar',
 
178
                                        bzr_dir)
176
179
 
177
180
        if dry_run:
178
181
            print "*** Write file: start_bzr.bat"