From 5a25c05216a117905a4b01695c6627498af2e9f8 Mon Sep 17 00:00:00 2001 From: xumia Date: Tue, 28 Feb 2023 10:31:46 +0000 Subject: [PATCH 1/2] [Build] Support to use loosen version when failed to install python packages --- src/sonic-build-hooks/scripts/buildinfo_base.sh | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/src/sonic-build-hooks/scripts/buildinfo_base.sh b/src/sonic-build-hooks/scripts/buildinfo_base.sh index a04dbc150df5..c725ea5d3d52 100755 --- a/src/sonic-build-hooks/scripts/buildinfo_base.sh +++ b/src/sonic-build-hooks/scripts/buildinfo_base.sh @@ -248,6 +248,11 @@ run_pip_command() $REAL_COMMAND "${parameters[@]}" local result=$? + if [ "$result" !=0 ]; then + echo "Failed to run the command with constraint, try to install with the original command" 1>&2 + $REAL_COMMAND "$@" + result=$? + fi rm $tmp_version_file return $result } From a982842ebc1b0bf0c47769feb836d785744be468 Mon Sep 17 00:00:00 2001 From: xumia Date: Tue, 28 Feb 2023 10:35:35 +0000 Subject: [PATCH 2/2] Fix the missing space character issue --- src/sonic-build-hooks/scripts/buildinfo_base.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/sonic-build-hooks/scripts/buildinfo_base.sh b/src/sonic-build-hooks/scripts/buildinfo_base.sh index c725ea5d3d52..da1bc54226f5 100755 --- a/src/sonic-build-hooks/scripts/buildinfo_base.sh +++ b/src/sonic-build-hooks/scripts/buildinfo_base.sh @@ -248,7 +248,7 @@ run_pip_command() $REAL_COMMAND "${parameters[@]}" local result=$? - if [ "$result" !=0 ]; then + if [ "$result" != 0 ]; then echo "Failed to run the command with constraint, try to install with the original command" 1>&2 $REAL_COMMAND "$@" result=$?