diff options
| -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/refresh.in | 9 |
5 files changed, 9 insertions, 8 deletions
@@ -963,7 +963,7 @@ msgstr "" msgid "Patch %s is unchanged\\n" msgstr "Patch %s ist unverändert\\n" -#: ../quilt/refresh.in:301 +#: ../quilt/refresh.in:295 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:301 +#: ../quilt/refresh.in:295 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:301 +#: ../quilt/refresh.in:295 msgid "Refreshed patch %s\\n" msgstr "パッチ %s をリフレッシュしました\\n" diff --git a/po/quilt.pot b/po/quilt.pot index fcb05d9..9b3df87 100644 --- a/po/quilt.pot +++ b/po/quilt.pot @@ -681,7 +681,7 @@ msgstr "" msgid "Patch %s is unchanged\\n" msgstr "" -#: ../quilt/refresh.in:301 +#: ../quilt/refresh.in:295 msgid "Refreshed patch %s\\n" msgstr "" diff --git a/quilt/refresh.in b/quilt/refresh.in index 3a0a459..4cbb8dd 100644 --- a/quilt/refresh.in +++ b/quilt/refresh.in @@ -288,17 +288,18 @@ if [ -e $patch_file ] && \ @DIFF@ -q $patch_file $tmp_result > /dev/null then printf $"Patch %s is unchanged\n" "$(print_patch $patch)" -elif ( [ -n "$QUILT_BACKUP" -a -e $patch_file ] && \ - ! cp $patch_file $patch_file~ ) || \ - ! cat_to_file $patch_file < $tmp_result +elif ( [ -z "$QUILT_BACKUP" -o ! -e $patch_file ] || \ + cp $patch_file $patch_file~ ) && \ + cat_to_file $patch_file < $tmp_result then + printf $"Refreshed patch %s\n" "$(print_patch $patch)" +else die 1 fi touch $QUILT_PC/$patch/.timestamp rm -f $QUILT_PC/$patch~refresh -printf $"Refreshed patch %s\n" "$(print_patch $patch)" if ! change_db_strip_level -p$opt_strip_level $patch then die 1 |