From 95620ef20f759ab9b414549708358d306fd52953 Mon Sep 17 00:00:00 2001 From: James Simpson Date: Sat, 12 Nov 2022 11:56:24 +0800 Subject: T4796: Honor additional_repositories Currently, additional_repositories in the effective build_config are ignored due to a bug wherein all values end up under `args['custom_apt_entry']` rather than `build_config['custom_apt_entry']`. This change fixes that, ensuring that the content of `build_config['additional_repositories]` is added to `build_config['custom_apt_entry']` alongside the command-line arguments. --- scripts/build-vyos-image | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/scripts/build-vyos-image b/scripts/build-vyos-image index baabc7fe..4cf45134 100755 --- a/scripts/build-vyos-image +++ b/scripts/build-vyos-image @@ -381,10 +381,9 @@ if __name__ == "__main__": f.write(vyos_repo_entry) # Add custom APT entries - if not args['custom_apt_entry']: - args['custom_apt_entry'] = [] if build_config.get('additional_repositories', False): - args['custom_apt_entry'] = args['custom_apt_entry'] + build_config['additional_repositories'] + build_config['custom_apt_entry'] += build_config['additional_repositories'] + if build_config.get('custom_apt_entry', False): custom_apt_file = defaults.CUSTOM_REPO_FILE entries = "\n".join(build_config['custom_apt_entry']) -- cgit v1.2.3