← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/config.py

  • Committer: Martin
  • Date: 2010-04-22 18:36:13 UTC
  • mto: (5177.1.1 integration2)
  • mto: This revision was merged to the branch mainline in revision 5179.
  • Revision ID: gzlist@googlemail.com-20100422183613-gruiwv2xsrjf0nhp
Fix more tests which were failing under -OO that had been missed earlier

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/config.py
193
193
            interpreted as a boolean. Returns True or False otherwise.
194
194
        """
195
195
        s = self._get_user_option(option_name)
196
 
        if s is None:
197
 
            # The option doesn't exist
198
 
            return None
199
 
        val = ui.bool_from_string(s)
200
 
        if val is None:
201
 
            # The value can't be interpreted as a boolean
202
 
            trace.warning('Value "%s" is not a boolean for "%s"',
203
 
                          s, option_name)
204
 
        return val
 
196
        return ui.bool_from_string(s)
205
197
 
206
198
    def get_user_option_as_list(self, option_name):
207
199
        """Get a generic option as a list - no special process, no default.
519
511
 
520
512
    def _write_config_file(self):
521
513
        path = self._get_filename()
522
 
        f = open(path, 'wb')
523
 
        osutils.copy_ownership_from_path(path)
 
514
        f = osutils.open_with_ownership(path, 'wb')
524
515
        self._get_parser().write(f)
525
516
        f.close()
526
517
 
819
810
                trace.mutter('creating config parent directory: %r', parent_dir)
820
811
            os.mkdir(parent_dir)
821
812
        trace.mutter('creating config directory: %r', path)
822
 
        os.mkdir(path)
823
 
        osutils.copy_ownership_from_path(path)
 
813
        osutils.mkdir_with_ownership(path)
824
814
 
825
815
 
826
816
def config_dir():