Skip to content

Commit 2603183

Browse files
committed
Fixed version honoring EXPLICIT_VERSION when present
Previously to master refactoring EXPLICIT_VERSION was used for VERSION if present. This was missed in the refactor and caused our new LTS 3.27.0 packages to have improper names including the sha as .x packages would. Ticket: ENT-13663 Changelog: none
1 parent ace3cc9 commit 2603183

File tree

1 file changed

+2
-1
lines changed

1 file changed

+2
-1
lines changed

build-scripts/version

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,8 @@
1717

1818
# The CFVERSION file is generated by the determine-version.sh script in the core
1919
# repository. The script is executed when you run the autogen.sh.
20-
VERSION=$(cat "$BASEDIR"/core/CFVERSION)
20+
CORE_VERSION=$(cat "$BASEDIR"/core/CFVERSION)
21+
VERSION="${EXPLICIT_VERSION:-$CORE_VERSION}"
2122
echo "$(basename $0): Debug: Detected CFEngine version number $VERSION"
2223

2324
# The RELEASE number is the actual release of the package. It starts as 1 and

0 commit comments

Comments
 (0)