diff options
-rw-r--r-- | po/de.po | 4 | ||||
-rw-r--r-- | po/fr.po | 4 | ||||
-rw-r--r-- | po/ja.po | 4 | ||||
-rw-r--r-- | po/quilt.pot | 4 | ||||
-rw-r--r-- | quilt.changes | 6 | ||||
-rw-r--r-- | quilt/scripts/patchfns.in | 8 |
6 files changed, 19 insertions, 11 deletions
@@ -1254,7 +1254,7 @@ msgstr "series-Datei vollständig angewandt, endet in Patch %s\\n" msgid "Patch %s does not exist\\n" msgstr "Patch %s existiert nicht\\n" -#: quilt/scripts/patchfns.in:830 +#: quilt/scripts/patchfns.in:832 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 " @@ -1267,7 +1267,7 @@ msgstr "" "quilt alle Patches mit der Version von quilt, die zur Erstellung des " "Arbeitsverzeichnisses verwendet wurde.\\n" -#: quilt/scripts/patchfns.in:915 +#: quilt/scripts/patchfns.in:917 msgid "" "The working tree was created by an older version of quilt. Please run 'quilt " "upgrade'.\\n" @@ -1263,7 +1263,7 @@ msgstr "La srie est compltement applique. Le dernier patch est %s.\\n" msgid "Patch %s does not exist\\n" msgstr "Le patch %s n'est pas dans la srie\\n" -#: quilt/scripts/patchfns.in:830 +#: quilt/scripts/patchfns.in:832 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 " @@ -1275,7 +1275,7 @@ msgstr "" "format %s (inclus). Veuillez retirer vos patches avec la version \n" "utilise pour les appliquer avant d'installer une version plus ancienne.\\n" -#: quilt/scripts/patchfns.in:915 +#: quilt/scripts/patchfns.in:917 msgid "" "The working tree was created by an older version of quilt. Please run 'quilt " "upgrade'.\\n" @@ -1228,7 +1228,7 @@ msgstr "" msgid "Patch %s does not exist\\n" msgstr "パッチ %s が存在しません\\n" -#: quilt/scripts/patchfns.in:830 +#: quilt/scripts/patchfns.in:832 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 " @@ -1240,7 +1240,7 @@ msgstr "" "ていません。ダウングレードする前に、pushしたバージョンの quiltを使って、\n" "すべてのパッチを pop してください。\\n" -#: quilt/scripts/patchfns.in:915 +#: quilt/scripts/patchfns.in:917 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 7a82b53..0f87dd1 100644 --- a/po/quilt.pot +++ b/po/quilt.pot @@ -868,7 +868,7 @@ msgstr "" msgid "Patch %s does not exist\\n" msgstr "" -#: quilt/scripts/patchfns.in:830 +#: quilt/scripts/patchfns.in:832 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 " @@ -876,7 +876,7 @@ msgid "" "downgrading.\\n" msgstr "" -#: quilt/scripts/patchfns.in:915 +#: quilt/scripts/patchfns.in:917 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 1d7560b..a776bfc 100644 --- a/quilt.changes +++ b/quilt.changes @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Thu Jan 26 13:39:37 CET 2006 - agruen@suse.de + +- Stop using find's -printf option: some versions of find don't + have it. + +------------------------------------------------------------------- Thu Jan 26 12:49:00 CET 2006 - agruen@suse.de - quilt/delete.in: Remove a superfluous message. diff --git a/quilt/scripts/patchfns.in b/quilt/scripts/patchfns.in index 172e2b1..4f56201 100644 --- a/quilt/scripts/patchfns.in +++ b/quilt/scripts/patchfns.in @@ -594,9 +594,11 @@ files_in_patch() if [ -d "$path" ] then - find "$path" -type f \ - -a ! -path "$path/.timestamp" \ - -printf "%P\n" + local files + files=( $(find "$path" -type f \ + -a ! -path "$path/.timestamp") ) \ + || return 1 + printf "%s\n" "${files[@]#$path/}" fi } |