diff options
| -rw-r--r-- | Makefile.in | 2 | ||||
| -rw-r--r-- | po/de.po | 30 | ||||
| -rw-r--r-- | po/fr.po | 30 | ||||
| -rw-r--r-- | po/ja.po | 30 | ||||
| -rw-r--r-- | po/quilt.pot | 30 | ||||
| -rw-r--r-- | quilt.changes | 8 | ||||
| -rw-r--r-- | quilt/diff.in | 8 | ||||
| -rw-r--r-- | quilt/import.in | 17 | ||||
| -rw-r--r-- | quilt/scripts/inspect.in | 4 |
9 files changed, 83 insertions, 76 deletions
diff --git a/Makefile.in b/Makefile.in index 283cf88..8f15ad4 100644 --- a/Makefile.in +++ b/Makefile.in @@ -280,7 +280,7 @@ compat :: $(COMPAT) # Usage: $(call VIRTUAL_SYMLINK, source, target) define VIRTUAL_SYMLINK @echo "Generating $(strip $(1)) wrapper" >&2; - @printf "#!%s\n%s "'"$$$$@"'"\n" $(BASH) $(strip $(1)) > $(2); + @printf "#!%s\nexec %s "'"$$$$@"'"\n" $(BASH) $(strip $(1)) > $(2); endef # Generate rules to create compat/<binary> for each binary in $(COMPAT_SYMLINKS) @@ -314,27 +314,27 @@ msgstr "" "Kann kein Diff mit -p$opt_strip_level erzeugen, bitte -p0 oder -p1 verwenden." "\\n" -#: quilt/diff.in:260 quilt/files.in:105 +#: quilt/diff.in:258 quilt/files.in:105 msgid "Patch %s not applied before patch %s\\n" msgstr "Patch %s ist nicht vor Patch %s angewandt\\n" -#: quilt/diff.in:310 quilt/pop.in:98 +#: quilt/diff.in:308 quilt/pop.in:98 msgid "Failed to copy files to temporary directory\\n" msgstr "Konnte Dateien nicht in temporäres Verzeichnis kopieren\\n" -#: quilt/diff.in:334 quilt/pop.in:122 +#: quilt/diff.in:332 quilt/pop.in:122 msgid "Failed to patch temporary files\\n" msgstr "Konnte temporäre Dateien nicht patchen\\n" -#: quilt/diff.in:353 +#: quilt/diff.in:351 msgid "File %s is not being modified\\n" msgstr "Datei %s wird nicht verändert.\\n" -#: quilt/diff.in:373 quilt/refresh.in:177 +#: quilt/diff.in:371 quilt/refresh.in:177 msgid "Diff failed, aborting\\n" msgstr "Diff fehlgeschlagen, Abbruch.\\n" -#: quilt/diff.in:380 +#: quilt/diff.in:378 msgid "Warning: more recent patches modify files in patch %s\\n" msgstr "Warnung: später angewandte Patches verändern Dateien von %s\\n" @@ -664,41 +664,41 @@ msgstr "" "Bitte verwenden Sie die Option -d {o|a|n} um anzugeben, welche Patch-Header " "erhalten bleiben sollen.\\n" -#: quilt/import.in:124 +#: quilt/import.in:125 msgid "Option \\`-P' can only be used when importing a single patch\\n" msgstr "" "Die Option \\`-P' kann nur beim Importieren eines einzelnen Patches " "verwendet werden\\n" -#: quilt/import.in:144 +#: quilt/import.in:145 msgid "Patch %s is applied\\n" msgstr "Patch %s ist angewandt\\n" -#: quilt/import.in:153 +#: quilt/import.in:154 msgid "Patch %s already exists in series.\\n" msgstr "Patch %s existiert bereits in der series-Datei\\n" -#: quilt/import.in:159 +#: quilt/import.in:160 msgid "Patch %s exists. Replace with -f.\\n" msgstr "Patch %s existiert bereits. Ersetzen mit -f.\\n" -#: quilt/import.in:170 +#: quilt/import.in:171 msgid "Replacing patch %s with new version\\n" msgstr "Ersetze Patch %s durch neuere Version\\n" -#: quilt/import.in:174 +#: quilt/import.in:175 msgid "Importing patch %s\\n" msgstr "Importiere patch %s\\n" -#: quilt/import.in:176 +#: quilt/import.in:177 msgid "Importing patch %s (stored as %s)\\n" msgstr "Importiere Patch %s (abgelegt als %s)\\n" -#: quilt/import.in:186 +#: quilt/import.in:187 msgid "Failed to import patch %s\\n" msgstr "Konnte Patch %s nicht importieren\\n" -#: quilt/import.in:193 +#: quilt/import.in:194 msgid "Failed to insert patch %s into file series\\n" msgstr "Konnte Patch %s nicht in die series-Datei einfügen\\n" @@ -316,27 +316,27 @@ msgstr "" "Impossible de crer des patches avec -p%s. Veuillez spcifier -p0 ou -p1 " "la place\\n" -#: quilt/diff.in:260 quilt/files.in:105 +#: quilt/diff.in:258 quilt/files.in:105 msgid "Patch %s not applied before patch %s\\n" msgstr "Le patch %s n'est pas appliqu avant %s\\n." -#: quilt/diff.in:310 quilt/pop.in:98 +#: quilt/diff.in:308 quilt/pop.in:98 msgid "Failed to copy files to temporary directory\\n" msgstr "Impossible de copier les fichiers dans le rpertoire temporaire\\n" -#: quilt/diff.in:334 quilt/pop.in:122 +#: quilt/diff.in:332 quilt/pop.in:122 msgid "Failed to patch temporary files\\n" msgstr "Impossible de patcher les fichiers temporaires\\n" -#: quilt/diff.in:353 +#: quilt/diff.in:351 msgid "File %s is not being modified\\n" msgstr "Le fichier %s n'est pas modifi.\\n" -#: quilt/diff.in:373 quilt/refresh.in:177 +#: quilt/diff.in:371 quilt/refresh.in:177 msgid "Diff failed, aborting\\n" msgstr "Le diff a chou. Abandon.\\n" -#: quilt/diff.in:380 +#: quilt/diff.in:378 msgid "Warning: more recent patches modify files in patch %s\\n" msgstr "Attention: un patch plus recent modifie des fichiers communs %s\\n" @@ -668,40 +668,40 @@ msgid "Please use -d {o|a|n} to specify which patch header(s) to keep.\\n" msgstr "" "Veuillez utiliser -d {o|a|n} pour spcifier quel(s) en-tte(s) conserver.\\n" -#: quilt/import.in:124 +#: quilt/import.in:125 msgid "Option \\`-P' can only be used when importing a single patch\\n" msgstr "" "L'option -P ne peut tre utilis que lors de l'import d'un seul patch.\\n" -#: quilt/import.in:144 +#: quilt/import.in:145 msgid "Patch %s is applied\\n" msgstr "Le patch %s n'est pas appliqu\\n" -#: quilt/import.in:153 +#: quilt/import.in:154 msgid "Patch %s already exists in series.\\n" msgstr "Le patch %s existe dj dans la srie.\\n" -#: quilt/import.in:159 +#: quilt/import.in:160 msgid "Patch %s exists. Replace with -f.\\n" msgstr "Le patch %s existe. Utilisez -f pour le remplacer.\\n" -#: quilt/import.in:170 +#: quilt/import.in:171 msgid "Replacing patch %s with new version\\n" msgstr "Remplacement du patch %s avec la nouvelle version\\n" -#: quilt/import.in:174 +#: quilt/import.in:175 msgid "Importing patch %s\\n" msgstr "Import du patch %s\\n" -#: quilt/import.in:176 +#: quilt/import.in:177 msgid "Importing patch %s (stored as %s)\\n" msgstr "Import du patch %s (enregistr dans %s)\\n" -#: quilt/import.in:186 +#: quilt/import.in:187 msgid "Failed to import patch %s\\n" msgstr "Impossible d'importer le patch %s\\n" -#: quilt/import.in:193 +#: quilt/import.in:194 msgid "Failed to insert patch %s into file series\\n" msgstr "Impossible d'inserer %s dans le fichier de srie.\\n" @@ -305,27 +305,27 @@ msgstr "" msgid "Cannot diff patches with -p%s, please specify -p0 or -p1 instead\\n" msgstr "-p%sでパッチの差分はとれません。-p0か -p1を指定してください\\n" -#: quilt/diff.in:260 quilt/files.in:105 +#: quilt/diff.in:258 quilt/files.in:105 msgid "Patch %s not applied before patch %s\\n" msgstr "パッチ %s は、パッチ %s の前に適用されていません\\n" -#: quilt/diff.in:310 quilt/pop.in:98 +#: quilt/diff.in:308 quilt/pop.in:98 msgid "Failed to copy files to temporary directory\\n" msgstr "テンポラリディレクトリへのファイルコピーに失敗しました\\n" -#: quilt/diff.in:334 quilt/pop.in:122 +#: quilt/diff.in:332 quilt/pop.in:122 msgid "Failed to patch temporary files\\n" msgstr "テンポラリファイルへのパッチ適用に失敗しました\\n" -#: quilt/diff.in:353 +#: quilt/diff.in:351 msgid "File %s is not being modified\\n" msgstr "ファイル %s は変更されていません\\n" -#: quilt/diff.in:373 quilt/refresh.in:177 +#: quilt/diff.in:371 quilt/refresh.in:177 msgid "Diff failed, aborting\\n" msgstr "差分に失敗しました。異常終了します\\n" -#: quilt/diff.in:380 +#: quilt/diff.in:378 msgid "Warning: more recent patches modify files in patch %s\\n" msgstr "警告: 最近のパッチが、パッチ %s 内のファイルを変更しています\\n" @@ -644,39 +644,39 @@ msgid "Please use -d {o|a|n} to specify which patch header(s) to keep.\\n" msgstr "" "どのパッチヘッダを残すか、オプション -d {o|a|n}を使って指定してください" -#: quilt/import.in:124 +#: quilt/import.in:125 msgid "Option \\`-P' can only be used when importing a single patch\\n" msgstr "オプション \\`-P'は、パッチを一つだけ取り込むときのみ有効です\\n" -#: quilt/import.in:144 +#: quilt/import.in:145 msgid "Patch %s is applied\\n" msgstr "パッチ %s は、すでに適用されています\\n" -#: quilt/import.in:153 +#: quilt/import.in:154 msgid "Patch %s already exists in series.\\n" msgstr "パッチ %s は、すでに seriesの中にあります\\n" -#: quilt/import.in:159 +#: quilt/import.in:160 msgid "Patch %s exists. Replace with -f.\\n" msgstr "パッチ %s は、すでに存在します。-fで置き換えることができます\\n" -#: quilt/import.in:170 +#: quilt/import.in:171 msgid "Replacing patch %s with new version\\n" msgstr "パッチ %s を新しいバージョンに置き換えます\\n" -#: quilt/import.in:174 +#: quilt/import.in:175 msgid "Importing patch %s\\n" msgstr "パッチ %s を取り込みます\\n" -#: quilt/import.in:176 +#: quilt/import.in:177 msgid "Importing patch %s (stored as %s)\\n" msgstr "パッチ %s を取り込んでいます (%s として保存されます)\\n" -#: quilt/import.in:186 +#: quilt/import.in:187 msgid "Failed to import patch %s\\n" msgstr "パッチ %s の取り込みに失敗しました\\n" -#: quilt/import.in:193 +#: quilt/import.in:194 msgid "Failed to insert patch %s into file series\\n" msgstr "seriesファイルへのパッチ %s の書き込みに失敗しました\\n" diff --git a/po/quilt.pot b/po/quilt.pot index e0af731..2478672 100644 --- a/po/quilt.pot +++ b/po/quilt.pot @@ -204,27 +204,27 @@ msgstr "" msgid "Cannot diff patches with -p%s, please specify -p0 or -p1 instead\\n" msgstr "" -#: quilt/diff.in:260 quilt/files.in:105 +#: quilt/diff.in:258 quilt/files.in:105 msgid "Patch %s not applied before patch %s\\n" msgstr "" -#: quilt/diff.in:310 quilt/pop.in:98 +#: quilt/diff.in:308 quilt/pop.in:98 msgid "Failed to copy files to temporary directory\\n" msgstr "" -#: quilt/diff.in:334 quilt/pop.in:122 +#: quilt/diff.in:332 quilt/pop.in:122 msgid "Failed to patch temporary files\\n" msgstr "" -#: quilt/diff.in:353 +#: quilt/diff.in:351 msgid "File %s is not being modified\\n" msgstr "" -#: quilt/diff.in:373 quilt/refresh.in:177 +#: quilt/diff.in:371 quilt/refresh.in:177 msgid "Diff failed, aborting\\n" msgstr "" -#: quilt/diff.in:380 +#: quilt/diff.in:378 msgid "Warning: more recent patches modify files in patch %s\\n" msgstr "" @@ -435,39 +435,39 @@ msgstr "" msgid "Please use -d {o|a|n} to specify which patch header(s) to keep.\\n" msgstr "" -#: quilt/import.in:124 +#: quilt/import.in:125 msgid "Option \\`-P' can only be used when importing a single patch\\n" msgstr "" -#: quilt/import.in:144 +#: quilt/import.in:145 msgid "Patch %s is applied\\n" msgstr "" -#: quilt/import.in:153 +#: quilt/import.in:154 msgid "Patch %s already exists in series.\\n" msgstr "" -#: quilt/import.in:159 +#: quilt/import.in:160 msgid "Patch %s exists. Replace with -f.\\n" msgstr "" -#: quilt/import.in:170 +#: quilt/import.in:171 msgid "Replacing patch %s with new version\\n" msgstr "" -#: quilt/import.in:174 +#: quilt/import.in:175 msgid "Importing patch %s\\n" msgstr "" -#: quilt/import.in:176 +#: quilt/import.in:177 msgid "Importing patch %s (stored as %s)\\n" msgstr "" -#: quilt/import.in:186 +#: quilt/import.in:187 msgid "Failed to import patch %s\\n" msgstr "" -#: quilt/import.in:193 +#: quilt/import.in:194 msgid "Failed to insert patch %s into file series\\n" msgstr "" diff --git a/quilt.changes b/quilt.changes index 59853d4..3e5c050 100644 --- a/quilt.changes +++ b/quilt.changes @@ -1,4 +1,12 @@ ------------------------------------------------------------------- +Fri Jan 27 06:29:02 CET 2006 - agruen@suse.de + +- Stop using bash <(...) process substitution: it triggers bugs + on some platforms. +- In source tree compat/ "virtual symlink" scripts, exec the + target binary instead of only calling it. + +------------------------------------------------------------------- Fri Jan 27 05:55:11 CET 2006 - agruen@suse.de - Unify existing -p and -n parameters that specify a patch: diff --git a/quilt/diff.in b/quilt/diff.in index 0287c16..07efb34 100644 --- a/quilt/diff.in +++ b/quilt/diff.in @@ -236,11 +236,9 @@ if [ -n "$opt_snapshot" -a ${#opt_files[@]} -eq 0 ] then # Add all files in the snapshot into the file list (they may all # have changed). - while read file - do - echo "${file#$QUILT_PC/$snap_subdir/}" >&4 - done \ - < <(find $QUILT_PC/$snap_subdir -type f | sort) + files=( $(find $QUILT_PC/$snap_subdir -type f | sort) ) + printf "%s\n" "${files[@]#$QUILT_PC/$snap_subdir/}" >&4 + unset files # Also look at all patches that are currently applied. opt_combine=1 first_patch="$(applied_patches | head -n 1)" diff --git a/quilt/import.in b/quilt/import.in index 1018411..92c8b2b 100644 --- a/quilt/import.in +++ b/quilt/import.in @@ -48,20 +48,20 @@ current top patch, and must be pushed after import to apply them. merge_patches() { - local old="$1" new="$2" old_desc new_desc + local old="$1" new="$2" + local old_desc=$(gen_tempfile) new_desc=$(gen_tempfile) - old_desc=$(cat "$old" | patch_header | strip_diffstat) - new_desc=$(cat "$new" | patch_header | strip_diffstat) + cat "$old" | patch_header | strip_diffstat > $old_desc + cat "$new" | patch_header | strip_diffstat > $new_desc if [ -z "$opt_desc" ] then - [ -z "$old_desc" ] && opt_desc=n - [ -z "$opt_desc" -a -z "$new_desc" ] && opt_desc=o + [ -s $old_desc ] || opt_desc=n + [ -z "$opt_desc" -a ! -s $new_desc ] && opt_desc=o if [ -z "$opt_desc" ] then - local diff=$(diff -u <(echo "$old_desc") \ - <(echo "$new_desc") \ + local diff=$(diff -u $old_desc $new_desc \ | sed -e '1,2d') if [ -n "$diff" ] then @@ -74,7 +74,7 @@ $"Please use -d {o|a|n} to specify which patch header(s) to keep.\n" >&2 fi fi - [ "$opt_desc" = n ] || echo "$old_desc" + [ "$opt_desc" = n ] || cat "$old_desc" [ "$opt_desc" = a ] && echo '---' if [ "$opt_desc" = o ] then @@ -82,6 +82,7 @@ $"Please use -d {o|a|n} to specify which patch header(s) to keep.\n" >&2 else cat "$new" fi + rm -f $old_desc $new_desc } options=`getopt -o P:d:fp:h -- "$@"` diff --git a/quilt/scripts/inspect.in b/quilt/scripts/inspect.in index d318ad2..bca4e6e 100644 --- a/quilt/scripts/inspect.in +++ b/quilt/scripts/inspect.in @@ -72,13 +72,13 @@ do case "$(file -b "$file")" in compress*|gzip*) echo -n "g" >&4 - echo "md5sum < <(gzip -cd $file)" >&2 + echo "gzip -cd $file | md5sum" >&2 set -- $(gzip -cd "$file" | md5sum) echo "$1 $file" ;; bzip2*) echo -n "b" >&4 - echo "md5sum < <(bzip2 -cd $file)" >&2 + echo "bzip2 -cd $file | md5sum" >&2 set -- $(bzip2 -cd "$file" | md5sum) echo "$1 $file" ;; |