vyos/vyos-build
1
0
Fork 0
mirror of https://github.com/vyos/vyos-build.git synced 2025-10-01 20:28:40 +02:00
Code Issues Packages Projects Releases Wiki Activity

build: T3664: filter out non-TOML files from the build flavor dir

Browse Source 
to avoid mistakenly listing auixilliary files like README
as flavors
This commit is contained in:
Daniil Baturin 2024-04-13 19:49:59 +00:00
parent 7fa66c77f1
commit c07268987c
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
scripts/image-build/build-vyos-image
View File

@ -150,7 +150,7 @@ if __name__ == "__main__":
flavor_dir = defaults.BUILD_FLAVORS_DIR flavor_dir = defaults.BUILD_FLAVORS_DIR
print(f"I: using build flavors directory {flavor_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 ## Set up the option parser
## XXX: It uses values from the default configuration file for its option defaults, ## 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: if git_branch is None:
git_branch = repo.active_branch.name git_branch = repo.active_branch.name
except Exception as e: except Exception as e:
exit(f'Could not retrieve information from git: {repr(e)}') print(f'W: Could not retrieve information from git: {repr(e)}')
build_git = "" build_git = ""
git_branch = "" git_branch = ""
# Create the build version string # Create the build version string
if build_config['build_type'] == 'development': if build_config['build_type'] == 'development':