diff options
Diffstat (limited to 'scripts')
| -rwxr-xr-x | scripts/apatch.in | 6 | ||||
| -rw-r--r-- | scripts/patchfns.in | 7 |
2 files changed, 7 insertions, 6 deletions
diff --git a/scripts/apatch.in b/scripts/apatch.in index 54efa81..bba756f 100755 --- a/scripts/apatch.in +++ b/scripts/apatch.in @@ -44,15 +44,15 @@ apply_patch() if [ "x${patch_file:(-3)}" = "x.gz" ] then gzip -cd $patch_file \ - | @PATCH@ $(patch_args $patch) --backup --prefix=".pc/$patch/" \ + | @PATCH@ $QUILT_PATCH_OPTS $(patch_args $patch) --backup --prefix=".pc/$patch/" \ -E $silent $force_apply 2>&1 elif [ "x${patch_file:(-4)}" = "x.bz2" ] then bzip2 -cd $patch_file \ - | @PATCH@ $(patch_args $patch) --backup --prefix=".pc/$patch/" \ + | @PATCH@ $QUILT_PATCH_OPTS $(patch_args $patch) --backup --prefix=".pc/$patch/" \ -E $silent $force_apply 2>&1 else - @PATCH@ $(patch_args $patch) --backup --prefix=".pc/$patch/" \ + @PATCH@ $QUILT_PATCH_OPTS $(patch_args $patch) --backup --prefix=".pc/$patch/" \ -E $silent $force_apply -i $patch_file 2>&1 fi } diff --git a/scripts/patchfns.in b/scripts/patchfns.in index 2ddf7ac..a715033 100644 --- a/scripts/patchfns.in +++ b/scripts/patchfns.in @@ -425,9 +425,10 @@ touched_by_patch() fix_diff_header() { - local from=$1 to=$2 - @SED@ -e 's/^--- [^ '$'\t'']*/--- '"$(quote_bre $from)"'/' \ - -e 's/^+++ [^ '$'\t'']*/+++ '"$(quote_bre $to)"'/' + local from=$1 to=$2 z + [ -n "$QUILT_NO_DIFF_TIMESTAMPS" ] && z='.*' + @SED@ -e 's/^--- [^ '$'\t'']*'$z'/--- '"$(quote_bre $from)"'/' \ + -e 's/^+++ [^ '$'\t'']*'$z'/+++ '"$(quote_bre $to)"'/' } diff_file() |