diff options
-rw-r--r-- | po/de.po | 12 | ||||
-rw-r--r-- | po/fr.po | 12 | ||||
-rw-r--r-- | po/ja.po | 12 | ||||
-rw-r--r-- | po/quilt.pot | 12 | ||||
-rw-r--r-- | quilt.changes | 8 | ||||
-rw-r--r-- | quilt/scripts/patchfns.in | 3 | ||||
-rw-r--r-- | test/three.test | 3 |
7 files changed, 37 insertions, 25 deletions
@@ -181,7 +181,7 @@ msgstr "Kein Patch %s\\n" msgid "No patches in series\\n" msgstr "Keine Patches in der series-Datei\\n" -#: quilt/delete.in:101 quilt/scripts/patchfns.in:539 +#: quilt/delete.in:101 quilt/scripts/patchfns.in:540 msgid "Patch %s is currently applied\\n" msgstr "Patch %s ist momentan angewandt\\n" @@ -1283,19 +1283,19 @@ msgstr "Konnte %s nicht auf %s umbenennen: %s\n" msgid "Patch %s is not in series\\n" msgstr "Patch %s ist nicht in der series-Datei\\n" -#: quilt/scripts/patchfns.in:518 +#: quilt/scripts/patchfns.in:519 msgid "Patch %s is not applied\\n" msgstr "Patch %s ist nicht angewandt\\n" -#: quilt/scripts/patchfns.in:555 +#: quilt/scripts/patchfns.in:556 msgid "File series fully applied, ends at patch %s\\n" msgstr "series-Datei vollständig angewandt, endet in Patch %s\\n" -#: quilt/scripts/patchfns.in:577 +#: quilt/scripts/patchfns.in:578 msgid "Patch %s does not exist\\n" msgstr "Patch %s existiert nicht\\n" -#: quilt/scripts/patchfns.in:832 +#: quilt/scripts/patchfns.in:833 msgid "" "The quilt meta-data in this tree has version %s, but this version of quilt " "can only handle meta-data formats up to and including version %s. Please pop " @@ -1308,7 +1308,7 @@ msgstr "" "quilt alle Patches mit der Version von quilt, die zur Erstellung des " "Arbeitsverzeichnisses verwendet wurde.\\n" -#: quilt/scripts/patchfns.in:917 +#: quilt/scripts/patchfns.in:918 msgid "" "The working tree was created by an older version of quilt. Please run 'quilt " "upgrade'.\\n" @@ -181,7 +181,7 @@ msgstr "Pas de patch suivant\\n" msgid "No patches in series\\n" msgstr "Aucun patch dans la série\\n" -#: quilt/delete.in:101 quilt/scripts/patchfns.in:539 +#: quilt/delete.in:101 quilt/scripts/patchfns.in:540 msgid "Patch %s is currently applied\\n" msgstr "Le patch %s est actuellement appliqué\\n" @@ -1298,19 +1298,19 @@ msgstr "Impossible de renommer %s en %s : %s\n" msgid "Patch %s is not in series\\n" msgstr "Le patch %s n'est pas dans la série\\n" -#: quilt/scripts/patchfns.in:518 +#: quilt/scripts/patchfns.in:519 msgid "Patch %s is not applied\\n" msgstr "Le patch %s n'est pas appliqué\\n" -#: quilt/scripts/patchfns.in:555 +#: quilt/scripts/patchfns.in:556 msgid "File series fully applied, ends at patch %s\\n" msgstr "La série est complètement appliquée. Le dernier patch est %s.\\n" -#: quilt/scripts/patchfns.in:577 +#: quilt/scripts/patchfns.in:578 msgid "Patch %s does not exist\\n" msgstr "Le patch %s n'existe pas\\n" -#: quilt/scripts/patchfns.in:832 +#: quilt/scripts/patchfns.in:833 msgid "" "The quilt meta-data in this tree has version %s, but this version of quilt " "can only handle meta-data formats up to and including version %s. Please pop " @@ -1322,7 +1322,7 @@ msgstr "" "format %s (inclus). Veuillez retirer vos patches avec la version \n" "utilisée pour les appliquer avant d'installer une version plus ancienne.\\n" -#: quilt/scripts/patchfns.in:917 +#: quilt/scripts/patchfns.in:918 msgid "" "The working tree was created by an older version of quilt. Please run 'quilt " "upgrade'.\\n" @@ -178,7 +178,7 @@ msgstr "次ã®ãƒ‘ッãƒã¯ã‚ã‚Šã¾ã›ã‚“\\n" msgid "No patches in series\\n" msgstr "シリーズã«ç™»éŒ²ã•ã‚Œã¦ã„るパッãƒãŒã‚ã‚Šã¾ã›ã‚“\\n" -#: quilt/delete.in:101 quilt/scripts/patchfns.in:539 +#: quilt/delete.in:101 quilt/scripts/patchfns.in:540 msgid "Patch %s is currently applied\\n" msgstr "パッム%s ã¯ç¾åœ¨é©ç”¨ã•ã‚Œã¦ã„ã¾ã™\\n" @@ -1253,20 +1253,20 @@ msgstr "パッム%s ã‹ã‚‰ %sã¸ã®åå‰ã®å¤‰æ›´ã«å¤±æ•—ã—ã¾ã—ãŸ: %s\n" msgid "Patch %s is not in series\\n" msgstr "パッム%s 㯠seriesã®ä¸ã«ã‚ã‚Šã¾ã›ã‚“\\n" -#: quilt/scripts/patchfns.in:518 +#: quilt/scripts/patchfns.in:519 msgid "Patch %s is not applied\\n" msgstr "パッム%s ã¯é©ç”¨ã•ã‚Œã¦ã„ã¾ã›ã‚“\\n" -#: quilt/scripts/patchfns.in:555 +#: quilt/scripts/patchfns.in:556 msgid "File series fully applied, ends at patch %s\\n" msgstr "" "seriesファイルã®ãƒ‘ッãƒã¯ã™ã¹ã¦é©ç”¨ã•ã‚Œã¦ã„ã¾ã™ã€‚最終パッãƒã¯ %s ã§ã™ã€‚\\n" -#: quilt/scripts/patchfns.in:577 +#: quilt/scripts/patchfns.in:578 msgid "Patch %s does not exist\\n" msgstr "パッム%s ãŒå˜åœ¨ã—ã¾ã›ã‚“\\n" -#: quilt/scripts/patchfns.in:832 +#: quilt/scripts/patchfns.in:833 msgid "" "The quilt meta-data in this tree has version %s, but this version of quilt " "can only handle meta-data formats up to and including version %s. Please pop " @@ -1278,7 +1278,7 @@ msgstr "" "ã¦ã„ã¾ã›ã‚“。ダウングレードã™ã‚‹å‰ã«ã€pushã—ãŸãƒãƒ¼ã‚¸ãƒ§ãƒ³ã® quiltを使ã£ã¦ã€\n" "ã™ã¹ã¦ã®ãƒ‘ッãƒã‚’ pop ã—ã¦ãã ã•ã„。\\n" -#: quilt/scripts/patchfns.in:917 +#: quilt/scripts/patchfns.in:918 msgid "" "The working tree was created by an older version of quilt. Please run 'quilt " "upgrade'.\\n" diff --git a/po/quilt.pot b/po/quilt.pot index 95f3fa2..7e006e9 100644 --- a/po/quilt.pot +++ b/po/quilt.pot @@ -121,7 +121,7 @@ msgstr "" msgid "No patches in series\\n" msgstr "" -#: quilt/delete.in:101 quilt/scripts/patchfns.in:539 +#: quilt/delete.in:101 quilt/scripts/patchfns.in:540 msgid "Patch %s is currently applied\\n" msgstr "" @@ -881,19 +881,19 @@ msgstr "" msgid "Patch %s is not in series\\n" msgstr "" -#: quilt/scripts/patchfns.in:518 +#: quilt/scripts/patchfns.in:519 msgid "Patch %s is not applied\\n" msgstr "" -#: quilt/scripts/patchfns.in:555 +#: quilt/scripts/patchfns.in:556 msgid "File series fully applied, ends at patch %s\\n" msgstr "" -#: quilt/scripts/patchfns.in:577 +#: quilt/scripts/patchfns.in:578 msgid "Patch %s does not exist\\n" msgstr "" -#: quilt/scripts/patchfns.in:832 +#: quilt/scripts/patchfns.in:833 msgid "" "The quilt meta-data in this tree has version %s, but this version of quilt " "can only handle meta-data formats up to and including version %s. Please pop " @@ -901,7 +901,7 @@ msgid "" "downgrading.\\n" msgstr "" -#: quilt/scripts/patchfns.in:917 +#: quilt/scripts/patchfns.in:918 msgid "" "The working tree was created by an older version of quilt. Please run 'quilt " "upgrade'.\\n" diff --git a/quilt.changes b/quilt.changes index 4f0c3f8..ddc7e03 100644 --- a/quilt.changes +++ b/quilt.changes @@ -1,4 +1,12 @@ ------------------------------------------------------------------- +Sat Apr 15 14:38:24 CEST 2006 - khali@linux-fr.org + +- quilt/scripts/patchfns.in: Fix broken return in function + find_applied_patch, which was causing a bogus error message + on failed pop. +- test/three.test: Test failed pop. + +------------------------------------------------------------------- Sun Mar 26 15:56:40 CEST 2006 - agruen@suse.de - test/mail.in: Test UTF-8 header encoding. diff --git a/quilt/scripts/patchfns.in b/quilt/scripts/patchfns.in index a84a911..64c2a11 100644 --- a/quilt/scripts/patchfns.in +++ b/quilt/scripts/patchfns.in @@ -511,8 +511,9 @@ find_applied_patch() if [ -n "$name" ] then - local patch=$(find_patch "$name") || return 1 + local patch + patch=$(find_patch "$name") || return 1 if ! is_applied "$patch" then printf $"Patch %s is not applied\n" \ diff --git a/test/three.test b/test/three.test index 07bdb33..632a089 100644 --- a/test/three.test +++ b/test/three.test @@ -166,5 +166,8 @@ $ quilt annotate f > No patches applied + $ quilt pop patch4.diff + > Patch patch4.diff is not in series + $ cd .. $ rm -rf d |