Skip to content

Do convert multiple libpath references #222

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

Closed
wants to merge 4 commits into from
Closed

Do convert multiple libpath references #222

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
556b2d8
Prepare for multiple conversion runs
Olf0 Dec 30, 2021
dda3f1a
Enhance log output
Olf0 Dec 30, 2021
b1fea73
Do convert multiple libpath references
Olf0 Dec 30, 2021
2a1f08b
Simplify code
Olf0 Dec 30, 2021
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
35 changes: 17 additions & 18 deletions src/tools/pm_apply
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -104,44 +104,43 @@ mangle_libpath() {
totl_lines=$(grep -c "^+++" "$PATCH_PATH")
cand_lines=$(grep -c "^+++ $p" "$PATCH_PATH")
if [ $cand_lines -eq 0 ]; then
continue # nothing found, try next
continue # nothing found, try next
else
found=$(( $found + $cand_lines ))
if [ $totl_lines -ne $cand_lines ]; then
# if there are several references in the patch file our mangling might do too much and cause the patch to fail.
log "WARNING: mixed patch, conversion might not work"
fi
fi

patch_edited_path="$PM_PATCH_BACKUP_DIR"/"$PATCH_EDITED_NAME"
log "found: ${p}, replacing libpath references"

mkdir -p "$PM_PATCH_BACKUP_DIR"
# prepare the pattern

# prepare the replacement pattern
pr=""
if [ $SYS_BITNESS -eq 32 ]; then
pr=$(printf '%s' "$p" | sed 's@/usr/lib64/@/usr/lib/@')
elif [ $SYS_BITNESS -eq 64 ]; then
pr=$(printf '%s' "$p" | sed 's@/usr/lib/@/usr/lib64/@')
fi
# doit
printf '#\n# patch converted to %sbit library paths from its original by Patchmanager >= 3.1\n# Date: %s\n#\n' $SYS_BITNESS $(date -Iseconds) > "$patch_edited_path"
sed "s@^+++ $p@+++ $pr@;s@^--- $p@--- $pr@" "$PATCH_PATH" >> "$patch_edited_path"
if [ $? -ne 0 ]; then
failure
if [ $found -eq $cand_lines ]; then # first run in loop
mkdir -p "$PM_PATCH_BACKUP_DIR"
patch_edited_path="$PM_PATCH_BACKUP_DIR"/"$PATCH_EDITED_NAME"
printf '#\n# Patch converted to %sbit library paths from its original by Patchmanager > 3.1\n# Date: %s\n#\n' $SYS_BITNESS $(date -Iseconds) > "$patch_edited_path" \
| cat - "$PATCH_PATH" > "$patch_edited_path"
fi
log
log "OK, conversion produced: $patch_edited_path"
log
# set the patch to apply to the new one:
PATCH_PATH="$patch_edited_path"
return
sed -i "s@^+++ $p@+++ $pr@;s@^--- $p@--- $pr@" "$patch_edited_path" || failure || true # patch the Patch
done
if [ $found -eq 0 ]; then
log
log "OK, found nothing to convert"
log "OK, found nothing to convert."
log
fi
else
log
log "OK, replaced $found libpath references and created: $patch_edited_path"
log
# set the patch to apply to the new one:
PATCH_PATH="$patch_edited_path"
fi
fi
}

Expand Down