diff options
| author | Andreas Gruenbacher <agruen@suse.de> | 2004-02-15 14:56:14 +0000 |
|---|---|---|
| committer | Andreas Gruenbacher <agruen@suse.de> | 2004-02-15 14:56:14 +0000 |
| commit | 2e083b83410563b1bc5ff8b2379315178ccc7bfd (patch) | |
| tree | 32c530c5b8f1c262ccb28fbf7e29d91e52905fbe /scripts | |
| parent | c5e8abb281aedeb2c496a84b12ec050a67a5afaa (diff) | |
| download | quilt-2e083b83410563b1bc5ff8b2379315178ccc7bfd.tar.gz | |
- Never fail when patching temporary files in `quilt diff -z',
only warn.
Diffstat (limited to 'scripts')
| -rw-r--r-- | scripts/patchfns.in | 4 | ||||
| -rwxr-xr-x | scripts/rpatch.in | 7 |
2 files changed, 3 insertions, 8 deletions
diff --git a/scripts/patchfns.in b/scripts/patchfns.in index 8649dfc..f59e72b 100644 --- a/scripts/patchfns.in +++ b/scripts/patchfns.in @@ -251,7 +251,7 @@ rename_in_series() local from=$1 to=$2 tmpfile=$(gen_tempfile) || return 1 - /usr/bin/gawk ' + @AWK@ ' /^'"$(quote_re $from)"'([ \t]|$)/ \ { sub(/'"$(quote_re $from)"'/, "'"${to//\"/\\\"}"'") good=1 } @@ -558,7 +558,7 @@ patch_description() @AWK@ ' $1 == "---" { exit } /^Index:[ \t]|^diff[ \t]|^==*$/ \ - { eat = eat $0 + { eat = eat $0 next } eat { print eat eat="" } diff --git a/scripts/rpatch.in b/scripts/rpatch.in index 92639bf..e3882a9 100755 --- a/scripts/rpatch.in +++ b/scripts/rpatch.in @@ -80,14 +80,9 @@ check_for_pending_changes() --no-backup-if-mismatch -E \ >/dev/null 2>/dev/null then - # If a patch was force applied (and therefore needs - # refreshing), we know that patching the temporary - # files won't succeed, either. So, ignore the error - # in that particular case. - if ! [ -e $QUILT_PC/$patch ] then - echo $"Failed to patch temporary files" + echo $"Failed to patch temporary files" >&2 rm -rf $workdir return 1 fi |