diff options
| author | Andreas Gruenbacher <agruen@suse.de> | 2005-06-14 10:09:11 +0000 |
|---|---|---|
| committer | Andreas Gruenbacher <agruen@suse.de> | 2005-06-14 10:09:11 +0000 |
| commit | 3393fbbb2ba7eca182a79144c58d03f397db8662 (patch) | |
| tree | a77d15058773c63e7eaaca3dc7e9b8d8b6c511ec | |
| parent | 5af592798f4ecc23bd911ffadb9e6291aaa17d65 (diff) | |
| download | quilt-3393fbbb2ba7eca182a79144c58d03f397db8662.tar.gz | |
- refresh command: also touch .pc/$patch/.timestamp when a patch
is found to be up-to-date (Peter Williams,
<pwil3058@bigpond.net.au>).
| -rw-r--r-- | po/de.po | 2 | ||||
| -rw-r--r-- | po/fr.po | 2 | ||||
| -rw-r--r-- | po/ja.po | 2 | ||||
| -rw-r--r-- | po/quilt.pot | 2 | ||||
| -rw-r--r-- | quilt.changes | 7 | ||||
| -rw-r--r-- | quilt/refresh.in | 9 |
6 files changed, 14 insertions, 10 deletions
@@ -963,7 +963,7 @@ msgstr "" msgid "Patch %s is unchanged\\n" msgstr "Patch %s ist unverändert\\n" -#: ../quilt/refresh.in:304 +#: ../quilt/refresh.in:301 msgid "Refreshed patch %s\\n" msgstr "Patch %s aufgefrischt\\n" @@ -927,7 +927,7 @@ msgstr "" msgid "Patch %s is unchanged\\n" msgstr "Le patch %s n'a pas t modifi\\n" -#: ../quilt/refresh.in:304 +#: ../quilt/refresh.in:301 msgid "Refreshed patch %s\\n" msgstr "Le patch %s a t rafraichi.\\n" @@ -954,7 +954,7 @@ msgstr "" msgid "Patch %s is unchanged\\n" msgstr "パッチ % に変更はありません\\n" -#: ../quilt/refresh.in:304 +#: ../quilt/refresh.in:301 msgid "Refreshed patch %s\\n" msgstr "パッチ %s をリフレッシュしました\\n" diff --git a/po/quilt.pot b/po/quilt.pot index 57613a8..fcb05d9 100644 --- a/po/quilt.pot +++ b/po/quilt.pot @@ -681,7 +681,7 @@ msgstr "" msgid "Patch %s is unchanged\\n" msgstr "" -#: ../quilt/refresh.in:304 +#: ../quilt/refresh.in:301 msgid "Refreshed patch %s\\n" msgstr "" diff --git a/quilt.changes b/quilt.changes index f589dce..7f9b2eb 100644 --- a/quilt.changes +++ b/quilt.changes @@ -1,4 +1,11 @@ ------------------------------------------------------------------- +Tue Jun 14 12:07:43 CEST 2005 - agruen@suse.de + +- refresh command: also touch .pc/$patch/.timestamp when a patch + is found to be up-to-date (Peter Williams, + <pwil3058@bigpond.net.au>). + +------------------------------------------------------------------- Sun Jun 12 17:53:10 CEST 2005 - agruen@suse.de - Documentation uodate from Jerome Lacoste diff --git a/quilt/refresh.in b/quilt/refresh.in index 9133802..3a0a459 100644 --- a/quilt/refresh.in +++ b/quilt/refresh.in @@ -285,14 +285,11 @@ fi cat $tmp_patch >> $tmp_result if [ -e $patch_file ] && \ - @DIFF@ -q $patch_file $tmp_result > /dev/null + @DIFF@ -q $patch_file $tmp_result > /dev/null then printf $"Patch %s is unchanged\n" "$(print_patch $patch)" - die 0 -fi - -if ( [ -n "$QUILT_BACKUP" -a -e $patch_file ] && \ - ! cp $patch_file $patch_file~ ) || \ +elif ( [ -n "$QUILT_BACKUP" -a -e $patch_file ] && \ + ! cp $patch_file $patch_file~ ) || \ ! cat_to_file $patch_file < $tmp_result then die 1 |