From 7474a31a832708fa302703cf1b3429238865290f Mon Sep 17 00:00:00 2001 From: Peter Barker Date: Sun, 10 Apr 2022 00:51:58 +1000 Subject: [PATCH] waf: take ap_version.h int items from environment as we do str items This will mean we take the integer version of GIT_VERSION from the env too --- Tools/ardupilotwaf/ardupilotwaf.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Tools/ardupilotwaf/ardupilotwaf.py b/Tools/ardupilotwaf/ardupilotwaf.py index eb7452f1c9..dd66b19c58 100644 --- a/Tools/ardupilotwaf/ardupilotwaf.py +++ b/Tools/ardupilotwaf/ardupilotwaf.py @@ -380,7 +380,7 @@ def ap_version_append_str(ctx, k, v): @conf def ap_version_append_int(ctx, k, v): - ctx.env['AP_VERSION_ITEMS'] += [(k,v)] + ctx.env['AP_VERSION_ITEMS'] += [(k, '{}'.format(os.environ.get(k, v)))] @conf def write_version_header(ctx, tgt):