osmith submitted this change.

View Change

Approvals: Jenkins Builder: Verified laforge: Looks good to me, but someone else must approve osmith: Looks good to me, approved fixeria: Looks good to me, but someone else must approve
gen_makefile: remove unused "r" variable

I guess the idea was to use it in the next line, but instead of the "r"
variable the function gets called directly. Remove it.

Fixes: 450dac79 ("gen_makefile: allow combining several .opts files")
Change-Id: Ia4c376c02ee721add5ed451b83edc281543cac69
---
M gen_makefile.py
1 file changed, 0 insertions(+), 1 deletion(-)

diff --git a/gen_makefile.py b/gen_makefile.py
index 4cfc313..fd0bac0 100755
--- a/gen_makefile.py
+++ b/gen_makefile.py
@@ -656,7 +656,6 @@
if configure_opts_file.endswith(".deps"):
print(f"WARNING: using {all_deps_file} instead of {configure_opts_file}")
continue
- r = read_configure_opts(configure_opts_file)
configure_opts.extend_dict(read_configure_opts(configure_opts_file))

make_dir = args.make_dir

To view, visit change 43616. To unsubscribe, or for help writing mail filters, visit settings.

Gerrit-MessageType: merged
Gerrit-Project: osmo-dev
Gerrit-Branch: master
Gerrit-Change-Id: Ia4c376c02ee721add5ed451b83edc281543cac69
Gerrit-Change-Number: 43616
Gerrit-PatchSet: 2
Gerrit-Owner: osmith <osmith@sysmocom.de>
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: fixeria <vyanitskiy@sysmocom.de>
Gerrit-Reviewer: laforge <laforge@osmocom.org>
Gerrit-Reviewer: osmith <osmith@sysmocom.de>
Gerrit-Reviewer: pespin <pespin@sysmocom.de>