← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/config.py

  • Committer: John Arbash Meinel
  • Date: 2006-07-02 01:21:07 UTC
  • mto: This revision was merged to the branch mainline in revision 1835.
  • Revision ID: john@arbash-meinel.com-20060702012107-19434bd3cf2f8e3d
Make it clearer what config file needs to be renamed.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/config.py
345
345
        name_generator = locations_config_filename
346
346
        if (not os.path.exists(name_generator()) and 
347
347
                os.path.exists(branches_config_filename())):
348
 
            warning('Please rename branches.conf to locations.conf')
 
348
            if sys.platform == 'win32':
 
349
                warning('Please rename %s to %s' 
 
350
                         % (branches_config_filename(),
 
351
                            locations_config_filename()))
 
352
            else:
 
353
                warning('Please rename ~/.bazaar/branches.conf'
 
354
                        ' to ~/.bazaar/locations.conf')
349
355
            name_generator = branches_config_filename
350
356
        super(LocationConfig, self).__init__(name_generator)
351
357
        self.location = location
579
585
    """Return per-user configuration ini file filename."""
580
586
    return pathjoin(config_dir(), 'branches.conf')
581
587
 
 
588
 
582
589
def locations_config_filename():
583
590
    """Return per-user configuration ini file filename."""
584
591
    return pathjoin(config_dir(), 'locations.conf')