Skip to content

[pm_unapply] Let log output be more expressive and consistent #226

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 2 commits into from
Jan 10, 2022
Merged

[pm_unapply] Let log output be more expressive and consistent #226

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
0940ffb
[pm_unapply] Let log output be more expressive and consistent
Olf0 Jan 4, 2022
a4641c9
Do not output $PATCH_FILE twice
Olf0 Jan 4, 2022
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
14 changes: 7 additions & 7 deletions src/tools/pm_unapply
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -97,27 +97,27 @@ clean_backup_patch() {
log

rm -rf "$PM_PATCH_BACKUP_DIR" > /dev/null 2>&1
log "Removed backup"
log " backup: $PM_PATCH_BACKUP_DIR"
log "Removed backup: $PM_PATCH_BACKUP_DIR"
log
}

#
# Bunch of safety checks and required initializations
#

if [ ! -f "$PM_LOG_FILE" ]; then
log "*** Patch Log Created by Unapply $(date) ***"
log "*** Patch-log created by pm_unapply script $(date) ***"
fi

log
log "----------------------------------"
log "PM UNAPPLY $(date)"
log "pm_unapply $(date)"
log "----------------------------------"
log

log "$(basename "$PATCH_DIR")"

log "Using PATCH_FILE=$PATCH_FILE"
log "Using patch file: $PATCH_FILE"

if [ -f "$PATCH_FILE" ]; then
log " contains text patch"
Expand All @@ -126,12 +126,12 @@ fi
log

if [ ! -x "$PATCH_EXEC" ]; then
log "ERROR: Cannot find $PATCH_EXEC"
log "ERROR: Cannot find patch executable $PATCH_EXEC"
failure
fi

if [ ! -f "$PATCH_FILE" ]; then
log "ERROR: Cannot find patch file !"
log "ERROR: Cannot find patch file!"
failure
fi

Expand Down