From 7c79f8c63ddedf31f7d75cd18bf8f8a41c1aa6b1 Mon Sep 17 00:00:00 2001 From: Chris Johns Date: Wed, 22 Jan 2025 13:55:03 +1100 Subject: [PATCH] waf: Handle no version label in VERSION with releases No version label in the VERSION file broke with releases. Closes #5186 --- wscript | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/wscript b/wscript index ffab3d3175..29f20d019d 100755 --- a/wscript +++ b/wscript @@ -1439,10 +1439,10 @@ def load_version(ctx): def configure_version(conf): version_label = load_version(conf) v_str = version["__RTEMS_MAJOR__"] + "." + version["__RTEMS_MINOR__"] - if int(version["__RTEMS_REVISION__"]) != 0 and version_label != "": + if int(version["__RTEMS_REVISION__"]) != 0: v_str += "." + version["__RTEMS_REVISION__"] - if version_label != "": - v_str += "." + version_label + if version_label is not None and version_label != "": + v_str += "." + version_label conf.msg("Configure RTEMS version", v_str, color="YELLOW")