ivampiresp/Spdk
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

pkgdep/git: Fix git version check

Browse Source 
f62834a6bb forgot to actually retrieve version string. Also, use
common function for comparing the strings.

Change-Id: I022ab54ea5b4edf0b596776dd35ca8637506ee46
Signed-off-by: Michal Berger <michalx.berger@intel.com>
Reviewed-on: https://review.spdk.io/gerrit/c/spdk/spdk/+/4833
Tested-by: SPDK CI Jenkins <sys_sgci@intel.com>
Reviewed-by: Paul Luse <paul.e.luse@intel.com>
Reviewed-by: Tomasz Zawadzki <tomasz.zawadzki@intel.com>
Reviewed-by: Jim Harris <james.r.harris@intel.com>
This commit is contained in:
Michal Berger 2020-10-22 17:28:43 +02:00 committed by Tomasz Zawadzki
parent 62df2c1e81
commit dec533bf17
2 changed files with 3 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
test/common/config/pkgdep/git
View File

@ -246,12 +246,9 @@ function install_libiscsi() {
function install_git() { function install_git() {
if type -P git; then if type -P git; then
if [[ $(sort -V) == "$GIT_VERSION"* ]]; then if ge "$(git --version | awk '{print $3}')" "$GIT_VERSION"; then
# Our version is on top, meaning there's a newer git version installed
# or we already have matching one on board. Either way, we don't need
# to do anything, return.
return 0 return 0
fi <<< "$GIT_VERSION"$'\n'"$(git --version)" fi
fi >/dev/null fi >/dev/null
install zlib-devel curl-devel install zlib-devel curl-devel

1
test/common/config/vm_setup.sh
View File

@ -101,6 +101,7 @@ function detect_package_manager() {
vmsetupdir=$(readlink -f "$(dirname "$0")") vmsetupdir=$(readlink -f "$(dirname "$0")")
rootdir=$(readlink -f "$vmsetupdir/../../../") rootdir=$(readlink -f "$vmsetupdir/../../../")
source "$rootdir/scripts/common.sh"
set_os_id_version set_os_id_version
detect_package_manager detect_package_manager