Skip to content

(Re-)move misplaced log output and counter initialisation #239

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Jan 16, 2022
Merged

(Re-)move misplaced log output and counter initialisation #239

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 5 additions & 8 deletions src/tools/pm_apply
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,11 +46,6 @@ log() {
echo "$@" | tee -a "$PM_LOG_FILE"
}

log "Mangle candidates"
log $MANGLE_CANDIDATES
log "Disable mangling"
log $DISABLE_MANGLING

failure() {
log
log "*** FAILED ***"
Expand Down Expand Up @@ -93,14 +88,16 @@ mangle_libpath() {
log "----------------------------------"
log

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

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