diff options
| author | Andreas Gruenbacher <agruen@suse.de> | 2003-11-24 12:25:04 +0000 |
|---|---|---|
| committer | Andreas Gruenbacher <agruen@suse.de> | 2003-11-24 12:25:04 +0000 |
| commit | 40642c694e3247246fd9a7bab181357da1b79624 (patch) | |
| tree | 9a4179fe72fbd9795c16f9f5530438e56a02c2af | |
| parent | b8f72ffcc92ad308eecb976e6b05255497e733ca (diff) | |
| download | quilt-40642c694e3247246fd9a7bab181357da1b79624.tar.gz | |
- Error check for `quilt diff -z filelist' was too strict; relax.
| -rw-r--r-- | quilt.changes | 5 | ||||
| -rw-r--r-- | quilt/diff.in | 7 |
2 files changed, 10 insertions, 2 deletions
diff --git a/quilt.changes b/quilt.changes index 9f70878..fdb7204 100644 --- a/quilt.changes +++ b/quilt.changes @@ -1,4 +1,9 @@ ------------------------------------------------------------------- +Mon Nov 24 13:23:39 CET 2003 - agruen@suse.de + +- Error check for `quilt diff -z filelist' was too strict; relax. + +------------------------------------------------------------------- Mon Nov 17 20:31:36 CET 2003 - agruen@suse.de - Add new command `quilt fold' to fold one patch into another. diff --git a/quilt/diff.in b/quilt/diff.in index bab0c8e..0f6c0b6 100644 --- a/quilt/diff.in +++ b/quilt/diff.in @@ -260,9 +260,12 @@ 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. + # in that particular case. Also, generating a + # relative diff for a subset of files in the patch + # will fail. - if ! [ -e $pwd/.pc/$last_patch~refresh ] + if ! [ -e $pwd/.pc/$last_patch~refresh -a \ + ${#opt_files[@]} -eq 0 ] then echo $"Failed to patch temporary files" die 1 |