matthew/sonic-buildimage
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

[Build][Bug]: fix the warning message not printed as expected issue (#10278)

Browse Source 
Fix the warning message not printed as expected issue
This commit is contained in:
xumia 2022-03-19 21:48:27 +08:00 committed by GitHub
parent fb7f046143
commit ed4f19fb28
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/sonic-build-hooks/hooks/apt-get
View File

@ -10,10 +10,10 @@ if [ -z "$REAL_COMMAND" ]; then
exit 1 exit 1
fi fi
INSTALL=$(check_apt_install) INSTALL=$(check_apt_install "$@")
COMMAND_INFO="Locked by command: $REAL_COMMAND $@" COMMAND_INFO="Locked by command: $REAL_COMMAND $@"
if [ "$INSTALL" == y ]; then if [ "$INSTALL" == y ]; then
check_apt_version check_apt_version "$@"
lock_result=$(acquire_apt_installation_lock "$COMMAND_INFO" ) lock_result=$(acquire_apt_installation_lock "$COMMAND_INFO" )
$REAL_COMMAND "$@" $REAL_COMMAND "$@"
command_result=$? command_result=$?

4
src/sonic-build-hooks/scripts/buildinfo_base.sh
View File

@ -213,6 +213,10 @@ check_apt_version()
continue continue
fi fi
if [ "$para" == "install" ]; then
continue
fi
if [[ "$para" == *=* ]]; then if [[ "$para" == *=* ]]; then
continue continue
else else