From c8c3b8184e8a00eee122b5a28e466214d9da770d Mon Sep 17 00:00:00 2001 From: Dafydd Jones Date: Mon, 20 Jan 2025 16:21:20 +0000 Subject: [PATCH] fix: fix display version for `nsclient` v0.6.5 and newer (4 parts) --- nsclient.sls | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/nsclient.sls b/nsclient.sls index 0444a2f3c..1c504e8b1 100644 --- a/nsclient.sls +++ b/nsclient.sls @@ -22,12 +22,17 @@ nsclient: {%- for version in versions %} - {#- v0.5.x.x and later Windows display versions have only three parts (e.g. 0.5.2039) #} + {#- v0.5.x.x up to v0.6.4 Windows display versions have only three parts (e.g. 0.5.2039) #} + {#- v0.6.5 and newer have display versions similar to 0.6.5.000 #} {%- if salt["pkg.compare_versions"](version, ">=", "0.5") %} {%- set parts = version.split(".") %} {%- set major, minor, patch = parts[:3] %} {%- set build = parts[3]|d("0") %} - {%- set display_version = ".".join([major, minor, patch ~ build.zfill(3)]) %} + {%- if salt["pkg.compare_versions"](version, "<", "0.6.5") %} + {%- set display_version = ".".join([major, minor, patch ~ build.zfill(3)]) %} + {%- else %} + {%- set display_version = ".".join([major, minor, patch, build.zfill(3)]) %} + {%- endif %} {%- endif %} '{{ display_version|d(version) }}':