Skip to content

Commit f3df007

Browse files
authored
(Re-)move misplaced log output and counter initialisation (#239)
1 parent 7108079 commit f3df007

File tree

1 file changed

+5
-8
lines changed

1 file changed

+5
-8
lines changed

src/tools/pm_apply

Lines changed: 5 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -46,11 +46,6 @@ log() {
4646
echo "$@" | tee -a "$PM_LOG_FILE"
4747
}
4848

49-
log "Mangle candidates"
50-
log $MANGLE_CANDIDATES
51-
log "Disable mangling"
52-
log $DISABLE_MANGLING
53-
5449
failure() {
5550
log
5651
log "*** FAILED ***"
@@ -93,14 +88,16 @@ mangle_libpath() {
9388
log "----------------------------------"
9489
log
9590

96-
found=0
9791
candidates="$MANGLE_CANDIDATES"
9892
if [ $SYS_BITNESS -eq 32 ]; then
9993
# first, convert the candidate list
100-
# variable expansion ${foo/lib/lib64} would work on bash, but not POSIX/ash/busybox
101-
candidates=$(printf '%s' "$MANGLE_CANDIDATES" | sed 's@/usr/lib/@/usr/lib64/@g' )
94+
# variable expansion ${foo/lib/lib64} would work on bash, but not POSIX sh or busybox's ash
95+
candidates=$(printf '%s' "$MANGLE_CANDIDATES" | sed 's@/usr/lib/@/usr/lib64/@g')
10296
fi
97+
log "Mangle candidates: $candidates"
98+
log
10399

100+
found=0
104101
for p in $candidates; do
105102
totl_lines=$(grep -c "^\+\+\+" "$PATCH_PATH")
106103
cand_lines=$(grep -c "^\+\+\+ [^/]*$p" "$PATCH_PATH")

0 commit comments

Comments
 (0)