bootstrap: flake8 and typo cleanups
Fix a typo and handle some flake8 code style issues. Signed-off-by: Marti Bolivar <marti@foundries.io>
This commit is contained in:
parent
2cff25e88c
commit
c852a5d498
|
@ -74,6 +74,7 @@ def west_dir(start=None):
|
||||||
'''
|
'''
|
||||||
return os.path.join(west_topdir(start), WEST_DIR)
|
return os.path.join(west_topdir(start), WEST_DIR)
|
||||||
|
|
||||||
|
|
||||||
def manifest_dir(start=None):
|
def manifest_dir(start=None):
|
||||||
'''
|
'''
|
||||||
Returns the path to the manifest/ directory, searching ``start`` and its
|
Returns the path to the manifest/ directory, searching ``start`` and its
|
||||||
|
@ -83,6 +84,7 @@ def manifest_dir(start=None):
|
||||||
'''
|
'''
|
||||||
return os.path.join(west_topdir(start), MANIFEST)
|
return os.path.join(west_topdir(start), MANIFEST)
|
||||||
|
|
||||||
|
|
||||||
def west_topdir(start=None):
|
def west_topdir(start=None):
|
||||||
'''
|
'''
|
||||||
Like west_dir(), but returns the path to the parent directory of the west/
|
Like west_dir(), but returns the path to the parent directory of the west/
|
||||||
|
@ -132,8 +134,7 @@ def init(argv):
|
||||||
init_parser = argparse.ArgumentParser(
|
init_parser = argparse.ArgumentParser(
|
||||||
prog='west init',
|
prog='west init',
|
||||||
formatter_class=argparse.RawDescriptionHelpFormatter,
|
formatter_class=argparse.RawDescriptionHelpFormatter,
|
||||||
description=
|
description='''
|
||||||
'''
|
|
||||||
Initializes a Zephyr installation. Use "west clone" afterwards to fetch the
|
Initializes a Zephyr installation. Use "west clone" afterwards to fetch the
|
||||||
sources.
|
sources.
|
||||||
|
|
||||||
|
@ -238,7 +239,7 @@ def bootstrap(args):
|
||||||
).validate()
|
).validate()
|
||||||
except pykwalify.errors.SchemaError as e:
|
except pykwalify.errors.SchemaError as e:
|
||||||
sys.exit("Error: Failed to parse manifest file '{}': {}"
|
sys.exit("Error: Failed to parse manifest file '{}': {}"
|
||||||
.format(manifest_file, e))
|
.format(manifest_file, e))
|
||||||
|
|
||||||
if 'url' in wdata:
|
if 'url' in wdata:
|
||||||
west_url = wdata['url']
|
west_url = wdata['url']
|
||||||
|
@ -282,7 +283,8 @@ def reinit(config_path, args):
|
||||||
print('=== Updated configuration written to {} ==='.format(config_path))
|
print('=== Updated configuration written to {} ==='.format(config_path))
|
||||||
|
|
||||||
if args.reset:
|
if args.reset:
|
||||||
cmd = ['update', '--reset-manifest', '--reset-projects', '--reset-west']
|
cmd = ['update', '--reset-manifest', '--reset-projects',
|
||||||
|
'--reset-west']
|
||||||
print("=== Running 'west {}' to update repositories ==="
|
print("=== Running 'west {}' to update repositories ==="
|
||||||
.format(' '.join(cmd)))
|
.format(' '.join(cmd)))
|
||||||
wrap(cmd)
|
wrap(cmd)
|
||||||
|
@ -401,7 +403,7 @@ def wrap(argv):
|
||||||
print('West repository version: {} ({})'.format(git_describe,
|
print('West repository version: {} ({})'.format(git_describe,
|
||||||
west_git_repo))
|
west_git_repo))
|
||||||
except subprocess.CalledProcessError:
|
except subprocess.CalledProcessError:
|
||||||
print('West repository verison: unknown; no tags were found')
|
print('West repository version: unknown; no tags were found')
|
||||||
sys.exit(0)
|
sys.exit(0)
|
||||||
|
|
||||||
# Replace the wrapper process with the "real" west
|
# Replace the wrapper process with the "real" west
|
||||||
|
|
Loading…
Reference in New Issue