Fix py3 version changed even version control enabled issue

sonic-net · Jan 12, 2021 · 27ed107 · 27ed107
1 parent 4ef3f13
commit 27ed107
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 1 deletion.
diff --git a/src/sonic-build-hooks/scripts/buildinfo_base.sh b/src/sonic-build-hooks/scripts/buildinfo_base.sh
@@ -24,7 +24,7 @@ log_err()
 
 get_command()
 {
-    local path=$(echo $PATH | sed 's#[^:]*buildinfo/scripts:##' | sed "s#/usr/sbin:##")
+    local path=$(echo $PATH | sed 's#[^:]*buildinfo/scripts:##' | sed "s#/usr/sbin:##" | sed "s#/usr/local/sbin:##")
     local command=$(PATH=$path which $1)
     echo $command
 }

diff --git a/src/sonic-build-hooks/scripts/symlink_build_hooks b/src/sonic-build-hooks/scripts/symlink_build_hooks
@@ -2,6 +2,7 @@
 
 HOOK_PATH=/usr/local/share/buildinfo/hooks
 TARGET_PATH=/usr/sbin
+[ -d /usr/local/sbin ] && TARGET_PATH=/usr/local/sbin
 FILES=$(ls $HOOK_PATH)
 
 usage()