Skip to content

Commit da2b78e

Browse files
committed
Only search for symbols if needed
1 parent 5527557 commit da2b78e

File tree

1 file changed

+6
-4
lines changed

1 file changed

+6
-4
lines changed

bin/ThirdPartyInstaller

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -351,9 +351,8 @@ function take_dependency_from_path() {
351351
do
352352
lookup_symbol "$depname" "$testversion" "$arch" "$symbol" && return 0
353353
done
354+
Log_Verbose "Symbol $symbol not found, will resort to $depname $depversion as fallback"
354355
fi
355-
356-
Log_Verbose "Symbol $symbol not found, will resort to $depname $depversion as fallback"
357356
echo "$depname $depversion"
358357
else
359358
# We have a path, but we don't have a link to that file under /System/Index.
@@ -365,8 +364,11 @@ function take_dependency_from_path() {
365364
depname=$(echo "$fullpath" | cut -d/ -f3)
366365
testversion=$(echo "$fullpath" | cut -d/ -f4)
367366
[ -z "$depversion" ] && depversion="$testversion"
368-
Log_Verbose "Looking for symbol on candidate file $candidate ($depname, $testversion)"
369-
lookup_symbol "$depname" "$testversion" "$arch" "$symbol" && return 0
367+
if [ "$symbol" ]
368+
then
369+
Log_Verbose "Looking for symbol on candidate file $candidate ($depname, $testversion)"
370+
lookup_symbol "$depname" "$testversion" "$arch" "$symbol" && return 0
371+
fi
370372
done
371373

372374
# We don't have a match. If we have a file name that satisfies the path but

0 commit comments

Comments
 (0)