Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Allow versions to contain a tilde (18.2) #317

Merged
merged 2 commits into from
Nov 5, 2019
Merged

Allow versions to contain a tilde (18.2) #317

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
d1ee3d6
core: Allow versions to contain a tilde
arogge Nov 4, 2019
b274a24
webui: Allow versions to contain a tilde
arogge Nov 4, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 1 addition & 1 deletion core/cmake/BareosExtractVersionInfo.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ IF (NOT DEFINED VERSION_STRING)
string(REGEX MATCH \".*\" BAREOS_FULL_VERSION ${VERSION_STRING})
string(REPLACE "\"" "" BAREOS_FULL_VERSION ${BAREOS_FULL_VERSION})
ELSE()
string(REGEX MATCH [0-9.a-zA-Z]+ BAREOS_FULL_VERSION ${VERSION_STRING})
string(REGEX MATCH [0-9.a-zA-Z~]+ BAREOS_FULL_VERSION ${VERSION_STRING})
ENDIF()

string(REGEX MATCH [0-9]+.[0-9]+.[0-9]+ BAREOS_NUMERIC_VERSION ${VERSION_STRING})
Expand Down
2 changes: 1 addition & 1 deletion webui/cmake/BareosExtractVersionInfo.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ IF (NOT DEFINED VERSION_STRING)
# VERSION_STRING now is something like #define VERSION "18.2.4rc2"
string(REGEX MATCH \".*\" BAREOS_FULL_VERSION ${VERSION_STRING})
ELSE()
string(REGEX MATCH [0-9.a-zA-Z]+ BAREOS_FULL_VERSION ${VERSION_STRING})
string(REGEX MATCH [0-9.a-zA-Z~]+ BAREOS_FULL_VERSION ${VERSION_STRING})
ENDIF()

string(REGEX MATCH [0-9]+.[0-9]+.[0-9]+ BAREOS_NUMERIC_VERSION ${VERSION_STRING})
Expand Down