Skip to content

Commit d8a7c02

Browse files
Merge pull request #2078 from craigcomstock/ent-13663
Fixed version honoring EXPLICIT_VERSION when present
2 parents ace3cc9 + 2603183 commit d8a7c02

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)