diff options
| author | Bryan Drewery <bdrewery@FreeBSD.org> | 2022-07-13 19:35:03 +0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-07-13 19:35:03 +0300 |
| commit | 419ffeb4e5e5a4d0e9a8a43c3532fdbd9c7a7365 (patch) | |
| tree | 13a6ab59d2fbf5aeadb9fdf4e0109af96b624543 | |
| parent | 8ca409c2f10ca6e4c5627a0a4a78fc9c170ceb7d (diff) | |
| parent | e485dff6ba00e2069ed6c1bfd598acb9196f4cb1 (diff) | |
Merge pull request #1004 from lyda/revisions
Handle revisions in the pkg version
| -rwxr-xr-x | src/share/poudriere/common.sh | 12 |
1 files changed, 11 insertions, 1 deletions
diff --git a/src/share/poudriere/common.sh b/src/share/poudriere/common.sh index c6527b80..976fb783 100755 --- a/src/share/poudriere/common.sh +++ b/src/share/poudriere/common.sh @@ -3517,7 +3517,7 @@ _pkg_version_expanded() { local -; set -f [ $# -eq 1 ] || eargs pkg_ver_expanded version local ver="$1" - local epoch ver_sub IFS + local epoch revision ver_sub IFS case "${ver}" in *,*) @@ -3528,6 +3528,15 @@ _pkg_version_expanded() { epoch="0" ;; esac + case "${ver}" in + *_*) + revision="${ver##*_}" + ver="${ver%_*}" + ;; + *) + revision="0" + ;; + esac _gsub "${ver}" "[_.]" " " ver_sub set -- ${ver_sub} @@ -3536,6 +3545,7 @@ _pkg_version_expanded() { printf "%02d" "$1" shift done + printf "%04d" "${revision}" printf "\n" } |