diff options
| author | Andreas Gruenbacher <agruen@suse.de> | 2006-01-21 21:51:52 +0000 |
|---|---|---|
| committer | Andreas Gruenbacher <agruen@suse.de> | 2006-01-21 21:51:52 +0000 |
| commit | e123d84425ed9128a2230bf6dcf66b39018d520f (patch) | |
| tree | 8dc4d5171137f6bf555fc269362398912d594d95 | |
| parent | 1455b44c6a3265cbfda24c695eb2dd231faa854b (diff) | |
| download | quilt-e123d84425ed9128a2230bf6dcf66b39018d520f.tar.gz | |
- Don't use date -r for comparing file timestamps.
| -rw-r--r-- | quilt.changes | 9 | ||||
| -rw-r--r-- | quilt/pop.in | 5 |
2 files changed, 8 insertions, 6 deletions
diff --git a/quilt.changes b/quilt.changes index 1999622..4d27736 100644 --- a/quilt.changes +++ b/quilt.changes @@ -1,5 +1,10 @@ ------------------------------------------------------------------- -Sat Jan 21 22:37:29 CET 2006 - agruen@suse.de +Sat Jan 21 22:46:23 CET 2006 - jayvdb@gmail.com + +- Don't use date -r for comparing file timestamps. + +------------------------------------------------------------------- +Sat Jan 21 22:37:29 CET 2006 - jayvdb@gmail.com - GNU patch 2.5 messages differ slightly from the messages of more recent versions. Recognize the old version's output when fixing @@ -7,7 +12,7 @@ Sat Jan 21 22:37:29 CET 2006 - agruen@suse.de version's output in the test suite. ------------------------------------------------------------------- -Sat Jan 21 21:32:59 CET 2006 - agruen@suse.de +Sat Jan 21 21:32:59 CET 2006 - jayvdb@gmail.com - test/run: Support regex matching in test scripts. diff --git a/quilt/pop.in b/quilt/pop.in index b6d72ac..4fc924f 100644 --- a/quilt/pop.in +++ b/quilt/pop.in @@ -75,12 +75,9 @@ files_may_have_changed() return 0 fi - local apply_ts=$(date -r "$QUILT_PC/$patch/.timestamp" '+%s') ts for file in $(files_in_patch $patch) do - ts=$(date -r $file '+%s' 2> /dev/null) - [ -z "$ts" ] && return 0 - [ "$ts" -gt $apply_ts ] && return 0 + [ "$QUILT_PC/$patch/.timestamp" -ot $file ] && return 0 done return 1 } |