diff options
| author | Daniil Baturin <daniil@vyos.io> | 2024-04-13 19:49:59 +0000 |
|---|---|---|
| committer | Daniil Baturin <daniil@vyos.io> | 2024-04-13 19:49:59 +0000 |
| commit | c07268987cb4f55a35240972e672e7d809f7ef4a (patch) | |
| tree | 900c073c182258a0212a15b56605a4afa9625cd5 | |
| parent | 7fa66c77f19694e2cfd275785344f53518b7fb2f (diff) | |
| download | vyos-build-c07268987cb4f55a35240972e672e7d809f7ef4a.tar.gz vyos-build-c07268987cb4f55a35240972e672e7d809f7ef4a.zip | |
build: T3664: filter out non-TOML files from the build flavor dir
to avoid mistakenly listing auixilliary files like README
as flavors
| -rwxr-xr-x | scripts/image-build/build-vyos-image | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/scripts/image-build/build-vyos-image b/scripts/image-build/build-vyos-image index 229bc2b..f213767 100755 --- a/scripts/image-build/build-vyos-image +++ b/scripts/image-build/build-vyos-image @@ -150,7 +150,7 @@ if __name__ == "__main__": flavor_dir = defaults.BUILD_FLAVORS_DIR print(f"I: using build flavors directory {flavor_dir}") - build_flavors = list(map(lambda f: os.path.splitext(f)[0], os.listdir(flavor_dir))) + build_flavors = [f[0] for f in map(os.path.splitext, os.listdir(flavor_dir)) if (f[1] == ".toml")] ## Set up the option parser ## XXX: It uses values from the default configuration file for its option defaults, @@ -346,9 +346,9 @@ if __name__ == "__main__": if git_branch is None: git_branch = repo.active_branch.name except Exception as e: - exit(f'Could not retrieve information from git: {repr(e)}') - build_git = "" - git_branch = "" + print(f'W: Could not retrieve information from git: {repr(e)}') + build_git = "" + git_branch = "" # Create the build version string if build_config['build_type'] == 'development': |