diff options
| author | Jean Delvare <jdelvare@suse.de> | 2009-12-12 10:04:03 +0100 |
|---|---|---|
| committer | Jean Delvare <jdelvare@suse.de> | 2009-12-12 10:04:03 +0100 |
| commit | f467d717cc1b7a89e63806c3ddfa761e78da55aa (patch) | |
| tree | f338b31327cc4265bae2e349fd05001eb09e214c | |
| parent | 5ce6b0473c8346c7c6d4fc68057d5ef174f4c132 (diff) | |
| download | quilt-f467d717cc1b7a89e63806c3ddfa761e78da55aa.tar.gz | |
- quilt/scripts/patchfns.in (diff_file): Swap options and
parameters for better portability.
| -rw-r--r-- | quilt.changes | 6 | ||||
| -rw-r--r-- | quilt/scripts/patchfns.in | 3 |
2 files changed, 8 insertions, 1 deletions
diff --git a/quilt.changes b/quilt.changes index b6bddfa..fe36128 100644 --- a/quilt.changes +++ b/quilt.changes @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Sat Dec 12 10:00:52 CET 2009 - jdelvare@suse.de + +- quilt/scripts/patchfns.in (diff_file): Swap options and + parameters for better portability. + +------------------------------------------------------------------- Fri Nov 27 18:36:27 CET 2009 - jdelvare@suse.de - Some (possibly all) versions of "file" do not recognize lzma- diff --git a/quilt/scripts/patchfns.in b/quilt/scripts/patchfns.in index 9ed4fd1..aef1a54 100644 --- a/quilt/scripts/patchfns.in +++ b/quilt/scripts/patchfns.in @@ -760,8 +760,9 @@ diff_file() -r "$new_file") fi - diff $QUILT_DIFF_OPTS $old_file $new_file \ + diff $QUILT_DIFF_OPTS \ --label "$old_hdr$old_date" --label "$new_hdr$new_date" \ + "$old_file" "$new_file" \ | if read line then if [ -z "$QUILT_NO_DIFF_INDEX" ] |