From dec533bf1731c7a8714304d8c3f0542d30e8b596 Mon Sep 17 00:00:00 2001 From: Michal Berger Date: Thu, 22 Oct 2020 17:28:43 +0200 Subject: [PATCH] pkgdep/git: Fix git version check f62834a6bb forgot to actually retrieve version string. Also, use common function for comparing the strings. Change-Id: I022ab54ea5b4edf0b596776dd35ca8637506ee46 Signed-off-by: Michal Berger Reviewed-on: https://review.spdk.io/gerrit/c/spdk/spdk/+/4833 Tested-by: SPDK CI Jenkins Reviewed-by: Paul Luse Reviewed-by: Tomasz Zawadzki Reviewed-by: Jim Harris --- test/common/config/pkgdep/git | 7 ++----- test/common/config/vm_setup.sh | 1 + 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/test/common/config/pkgdep/git b/test/common/config/pkgdep/git index 9c4677b68..b4563439d 100644 --- a/test/common/config/pkgdep/git +++ b/test/common/config/pkgdep/git @@ -246,12 +246,9 @@ function install_libiscsi() { function install_git() { if type -P git; then - if [[ $(sort -V) == "$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. + if ge "$(git --version | awk '{print $3}')" "$GIT_VERSION"; then return 0 - fi <<< "$GIT_VERSION"$'\n'"$(git --version)" + fi fi >/dev/null install zlib-devel curl-devel diff --git a/test/common/config/vm_setup.sh b/test/common/config/vm_setup.sh index d920790f0..5a25103c8 100755 --- a/test/common/config/vm_setup.sh +++ b/test/common/config/vm_setup.sh @@ -101,6 +101,7 @@ function detect_package_manager() { vmsetupdir=$(readlink -f "$(dirname "$0")") rootdir=$(readlink -f "$vmsetupdir/../../../") +source "$rootdir/scripts/common.sh" set_os_id_version detect_package_manager