config.py: replace log API calls

We want to move to the WestCommand versions.

Signed-off-by: Martí Bolívar <marti.bolivar@nordicsemi.no>
This commit is contained in:
Martí Bolívar 2022-08-29 17:12:11 -07:00 committed by Marti Bolivar
parent 77abde894c
commit e204885023
1 changed files with 6 additions and 7 deletions

View File

@ -6,7 +6,6 @@
import argparse import argparse
from west import log
from west.configuration import ConfigFile from west.configuration import ConfigFile
from west.commands import WestCommand, CommandError from west.commands import WestCommand, CommandError
@ -154,7 +153,7 @@ class Config(WestCommand):
def list(self, args): def list(self, args):
what = args.configfile or ALL what = args.configfile or ALL
for option, value in self.config.items(configfile=what): for option, value in self.config.items(configfile=what):
log.inf(f'{option}={value}') self.inf(f'{option}={value}')
def delete(self, args): def delete(self, args):
if args.delete_all: if args.delete_all:
@ -171,7 +170,7 @@ class Config(WestCommand):
return return
except KeyError: except KeyError:
if i == len(configfiles) - 1: if i == len(configfiles) - 1:
log.dbg( self.dbg(
f'{args.name} was not set in requested location(s)') f'{args.name} was not set in requested location(s)')
raise CommandError(returncode=1) raise CommandError(returncode=1)
except PermissionError as pe: except PermissionError as pe:
@ -180,9 +179,9 @@ class Config(WestCommand):
def read(self, args): def read(self, args):
value = self.config.get(args.name, configfile=args.configfile or ALL) value = self.config.get(args.name, configfile=args.configfile or ALL)
if value is not None: if value is not None:
log.inf(value) self.inf(value)
else: else:
log.dbg(f'{args.name} is unset') self.dbg(f'{args.name} is unset')
raise CommandError(returncode=1) raise CommandError(returncode=1)
def write(self, args): def write(self, args):
@ -195,5 +194,5 @@ class Config(WestCommand):
def _perm_error(self, pe, what, name): def _perm_error(self, pe, what, name):
rootp = ('; are you root/administrator?' if what in [SYSTEM, ALL] rootp = ('; are you root/administrator?' if what in [SYSTEM, ALL]
else '') else '')
log.die(f"can't update {name}: " self.die(f"can't update {name}: "
f"permission denied when writing {pe.filename}{rootp}") f"permission denied when writing {pe.filename}{rootp}")