diff options
| author | Jean Delvare <jdelvare@suse.de> | 2012-12-05 14:53:15 +0100 |
|---|---|---|
| committer | Jean Delvare <jdelvare@suse.de> | 2012-12-05 14:53:15 +0100 |
| commit | 78e3884a221ffad79fd977219dd1150a89759a08 (patch) | |
| tree | 6a047d15ef493a02879e78dcb6b1203373fecf36 | |
| parent | 6c783be0682917b393ce72c51e75eee3b043d954 (diff) | |
| download | quilt-78e3884a221ffad79fd977219dd1150a89759a08.tar.gz | |
remove: Fix parameter quoting
| -rw-r--r-- | quilt.changes | 1 | ||||
| -rw-r--r-- | quilt/remove.in | 20 |
2 files changed, 11 insertions, 10 deletions
diff --git a/quilt.changes b/quilt.changes index ccf7bbd..5ccedb0 100644 --- a/quilt.changes +++ b/quilt.changes @@ -5,6 +5,7 @@ Wed Dec 5 14:44:13 CET 2012 - jdelvare@suse.de - rename: Fix parameter quoting. - diff: Fix parameter quoting. - refresh: Fix parameter quoting. +- remove: Fix parameter quoting. ------------------------------------------------------------------- Wed Dec 5 14:43:58 CET 2012 - jdelvare@suse.de diff --git a/quilt/remove.in b/quilt/remove.in index ff9aae5..e3aec7f 100644 --- a/quilt/remove.in +++ b/quilt/remove.in @@ -48,7 +48,7 @@ while true do case "$1" in -P) - opt_patch="$2" + opt_patch=$2 shift 2 ;; -h) usage -h ;; @@ -68,38 +68,38 @@ patch=$(find_applied_patch "$opt_patch") || exit 1 status=0 for file in "$@" do - if ! file_in_patch "$SUBDIR$file" $patch + if ! file_in_patch "$SUBDIR$file" "$patch" then printf $"File %s is not in patch %s\n" \ - "$SUBDIR$file" "$(print_patch $patch)" >&2 + "$SUBDIR$file" "$(print_patch "$patch")" >&2 status=1 continue fi - next_patch=$(next_patch_for_file $patch "$SUBDIR$file") + next_patch=$(next_patch_for_file "$patch" "$SUBDIR$file") if [ -n "$next_patch" ] then printf $"File %s modified by patch %s\n" \ - "$SUBDIR$file" "$(print_patch $next_patch)" + "$SUBDIR$file" "$(print_patch "$next_patch")" status=1 continue fi # Restore file from backup - if ! $QUILT_DIR/scripts/backup-files -r -t -s -B $QUILT_PC/$patch/ "$SUBDIR$file" + if ! $QUILT_DIR/scripts/backup-files -r -t -s -B "$QUILT_PC/$patch/" "$SUBDIR$file" then printf $"Failed to remove file %s from patch %s\n" \ - "$SUBDIR$file" "$(print_patch $patch)" >&2 + "$SUBDIR$file" "$(print_patch "$patch")" >&2 status=1 continue fi - if [ -e $(dirname $QUILT_PC/$patch~refresh) -a \ - -e $(patch_file_name $patch) ] + if [ -e "$(dirname "$QUILT_PC/$patch~refresh")" -a \ + -e "$(patch_file_name "$patch")" ] then # The patch must be refreshed in order to get rid of the # patch permanently. - touch $QUILT_PC/$patch~refresh + touch "$QUILT_PC/$patch~refresh" fi printf $"File %s removed from patch %s\n" \ |