Revision 362adf50 kamaki/cli/config.py

b/kamaki/cli/config.py
79 79
        #  'livetest_cli': 'livetest',
80 80
        #  'astakos_cli': 'snf-astakos'
81 81
    },
82
    'remotes':
82
    'remote':
83 83
    {
84 84
        'default': {
85 85
            'url': '',
......
220 220
                return 2.0
221 221
        log.warning('........ nope')
222 222
        log.warning('Config file heuristic 2: at least 1 remote section ?')
223
        if 'remotes' in sections:
224
            for r in self.keys('remotes'):
223
        if 'remote' in sections:
224
            for r in self.keys('remote'):
225 225
                log.warning('... found remote "%s"' % r)
226 226
                return 3.0
227 227
        log.warning('........ nope')
......
238 238

  
239 239
        :raises KeyError: if remote or remote's option does not exist
240 240
        """
241
        r = self.get('remotes', remote)
241
        r = self.get('remote', remote)
242 242
        if not r:
243 243
            raise KeyError('Remote "%s" does not exist' % remote)
244 244
        return r[option]
245 245

  
246
    def get_global(self, option):
247
        return self.get('global', option)
248

  
246 249
    def set_remote(self, remote, option, value):
247 250
        try:
248
            d = self.get('remotes', remote)
251
            d = self.get('remote', remote)
249 252
        except KeyError:
250 253
            pass
251 254
        d[option] = value
252
        self.set('remotes', remote, d)
255
        self.set('remote', remote, d)
256

  
257
    def set_global(self, option, value):
258
        self.set('global', option, value)
253 259

  
254 260
    def _load_defaults(self):
255 261
        for section, options in DEFAULTS.items():
......
305 311
        self._overrides[section][option] = value
306 312

  
307 313
    def write(self):
308
        for r, d in self.items('remotes'):
314
        for r, d in self.items('remote'):
309 315
            for k, v in d.items():
310 316
                self.set('remote "%s"' % r, k, v)
311
        self.remove_section('remotes')
317
        self.remove_section('remote')
312 318

  
313 319
        with open(self.path, 'w') as f:
314 320
            os.chmod(self.path, 0600)

Also available in: Unified diff