diff options
| -rw-r--r-- | po/de.po | 31 | ||||
| -rw-r--r-- | po/fr.po | 31 | ||||
| -rw-r--r-- | po/ja.po | 31 | ||||
| -rw-r--r-- | po/quilt.pot | 22 | ||||
| -rw-r--r-- | quilt.changes | 5 | ||||
| -rw-r--r-- | quilt/diff.in | 29 |
6 files changed, 58 insertions, 91 deletions
@@ -273,35 +273,23 @@ msgstr "" msgid "Patch %s not applied before patch %s\\n" msgstr "Patch %s ist nicht vor Patch %s angewandt\\n" -#: ../quilt/diff.in:342 -msgid "Cannot change into directory %s\\n" -msgstr "Kann nicht in Verzeichnis %s wechseln\\n" - -#: ../quilt/diff.in:349 ../quilt/pop.in:114 +#: ../quilt/diff.in:343 ../quilt/pop.in:114 msgid "Failed to copy files to temporary directory\\n" msgstr "Konnte Dateien nicht in temporäres Verzeichnis kopieren\\n" -#: ../quilt/diff.in:360 -msgid "Cannot change to temporary directory\\n" -msgstr "Kann nicht in temporäres Verzeichnis wechseln\\n" - -#: ../quilt/diff.in:379 ../quilt/pop.in:138 +#: ../quilt/diff.in:367 ../quilt/pop.in:138 msgid "Failed to patch temporary files\\n" msgstr "Konnte temporäre Dateien nicht patchen\\n" -#: ../quilt/diff.in:385 -msgid "Cannot change to source directory\\n" -msgstr "Kann nicht in Quellverzeichnis wechseln\\n" - -#: ../quilt/diff.in:403 +#: ../quilt/diff.in:386 msgid "File %s is not being modified\\n" msgstr "Datei %s wird nicht verändert.\\n" -#: ../quilt/diff.in:423 ../quilt/refresh.in:201 +#: ../quilt/diff.in:406 ../quilt/refresh.in:201 msgid "Diff failed, aborting\\n" msgstr "Diff fehlgeschlagen, Abbruch.\\n" -#: ../quilt/diff.in:430 +#: ../quilt/diff.in:413 msgid "More recent patches modify files in patch %s\\n" msgstr "Später angewandte Patches verändern Dateien von %s\\n" @@ -1197,6 +1185,15 @@ msgstr "" "Das Arbeitsverzeichnis wurde von einer älteren Version von quilt erstellt. " "Bitte führen Sie \\`quilt upgrade' aus.\\n" +#~ msgid "Cannot change into directory %s\\n" +#~ msgstr "Kann nicht in Verzeichnis %s wechseln\\n" + +#~ msgid "Cannot change to temporary directory\\n" +#~ msgstr "Kann nicht in temporäres Verzeichnis wechseln\\n" + +#~ msgid "Cannot change to source directory\\n" +#~ msgstr "Kann nicht in Quellverzeichnis wechseln\\n" + #~ msgid "" #~ "\n" #~ "Fork the topmost patch. If new_name is missing, the name of the\n" @@ -282,35 +282,23 @@ msgstr "" msgid "Patch %s not applied before patch %s\\n" msgstr "Le patch %s n'est pas appliqu avant %s\\n." -#: ../quilt/diff.in:342 -msgid "Cannot change into directory %s\\n" -msgstr "Impossible d'entrer dans le rpertoire %s\\n" - -#: ../quilt/diff.in:349 ../quilt/pop.in:114 +#: ../quilt/diff.in:343 ../quilt/pop.in:114 msgid "Failed to copy files to temporary directory\\n" msgstr "Impossible de copier les fichiers dans le rpertoire temporaire\\n" -#: ../quilt/diff.in:360 -msgid "Cannot change to temporary directory\\n" -msgstr "Impossible d'entrer dans le rpertoire temporaire\\n" - -#: ../quilt/diff.in:379 ../quilt/pop.in:138 +#: ../quilt/diff.in:367 ../quilt/pop.in:138 msgid "Failed to patch temporary files\\n" msgstr "Impossible de patcher les fichiers temporaires\\n" -#: ../quilt/diff.in:385 -msgid "Cannot change to source directory\\n" -msgstr "Impossible d'entrer dans le rpertoire source\\n" - -#: ../quilt/diff.in:403 +#: ../quilt/diff.in:386 msgid "File %s is not being modified\\n" msgstr "Le fichier %s n'est pas modifi.\\n" -#: ../quilt/diff.in:423 ../quilt/refresh.in:201 +#: ../quilt/diff.in:406 ../quilt/refresh.in:201 msgid "Diff failed, aborting\\n" msgstr "Le diff a chou. Abandon.\\n" -#: ../quilt/diff.in:430 +#: ../quilt/diff.in:413 msgid "More recent patches modify files in patch %s\\n" msgstr "Un patch plus recent modifie des fichiers communs %s.\\n" @@ -1161,6 +1149,15 @@ msgstr "" "Votre arbre a t cr par une vieille version de quilt. Veuillez \n" "utiliser quilt upgrade .\\n" +#~ msgid "Cannot change into directory %s\\n" +#~ msgstr "Impossible d'entrer dans le rpertoire %s\\n" + +#~ msgid "Cannot change to temporary directory\\n" +#~ msgstr "Impossible d'entrer dans le rpertoire temporaire\\n" + +#~ msgid "Cannot change to source directory\\n" +#~ msgstr "Impossible d'entrer dans le rpertoire source\\n" + #~ msgid "" #~ "\n" #~ "Fork the topmost patch. If new_name is missing, the name of the\n" @@ -268,35 +268,23 @@ msgstr "-p%sでパッチの差分はとれません。-p0か -p1を指定して msgid "Patch %s not applied before patch %s\\n" msgstr "パッチ %s は、パッチ %s の前に適用されていません\\n" -#: ../quilt/diff.in:342 -msgid "Cannot change into directory %s\\n" -msgstr "ディレクトリ %s に移動できません\\n" - -#: ../quilt/diff.in:349 ../quilt/pop.in:114 +#: ../quilt/diff.in:343 ../quilt/pop.in:114 msgid "Failed to copy files to temporary directory\\n" msgstr "テンポラリディレクトリへのファイルコピーに失敗しました\\n" -#: ../quilt/diff.in:360 -msgid "Cannot change to temporary directory\\n" -msgstr "テンポラリディレクトリに移動できません\\n" - -#: ../quilt/diff.in:379 ../quilt/pop.in:138 +#: ../quilt/diff.in:367 ../quilt/pop.in:138 msgid "Failed to patch temporary files\\n" msgstr "テンポラリファイルへのパッチ適用に失敗しました\\n" -#: ../quilt/diff.in:385 -msgid "Cannot change to source directory\\n" -msgstr "ソースディレクトリに移動できません\\n" - -#: ../quilt/diff.in:403 +#: ../quilt/diff.in:386 msgid "File %s is not being modified\\n" msgstr "ファイル %sは変更されていません\\n" -#: ../quilt/diff.in:423 ../quilt/refresh.in:201 +#: ../quilt/diff.in:406 ../quilt/refresh.in:201 msgid "Diff failed, aborting\\n" msgstr "差分に失敗しました。異常終了します\\n" -#: ../quilt/diff.in:430 +#: ../quilt/diff.in:413 msgid "More recent patches modify files in patch %s\\n" msgstr "最近のパッチが、パッチ %s内のファイルを変更しています\\n" @@ -1185,6 +1173,15 @@ msgstr "" "現在作業中のディレクトリは古いバージョンの quiltによって作られたもので" "す。'quilt upgrade'を実行してください。\\n" +#~ msgid "Cannot change into directory %s\\n" +#~ msgstr "ディレクトリ %s に移動できません\\n" + +#~ msgid "Cannot change to temporary directory\\n" +#~ msgstr "テンポラリディレクトリに移動できません\\n" + +#~ msgid "Cannot change to source directory\\n" +#~ msgstr "ソースディレクトリに移動できません\\n" + #~ msgid "" #~ "\n" #~ "Fork the topmost patch. If new_name is missing, the name of the\n" diff --git a/po/quilt.pot b/po/quilt.pot index a15c9b2..b81f025 100644 --- a/po/quilt.pot +++ b/po/quilt.pot @@ -189,35 +189,23 @@ msgstr "" msgid "Patch %s not applied before patch %s\\n" msgstr "" -#: ../quilt/diff.in:342 -msgid "Cannot change into directory %s\\n" -msgstr "" - -#: ../quilt/diff.in:349 ../quilt/pop.in:114 +#: ../quilt/diff.in:343 ../quilt/pop.in:114 msgid "Failed to copy files to temporary directory\\n" msgstr "" -#: ../quilt/diff.in:360 -msgid "Cannot change to temporary directory\\n" -msgstr "" - -#: ../quilt/diff.in:379 ../quilt/pop.in:138 +#: ../quilt/diff.in:367 ../quilt/pop.in:138 msgid "Failed to patch temporary files\\n" msgstr "" -#: ../quilt/diff.in:385 -msgid "Cannot change to source directory\\n" -msgstr "" - -#: ../quilt/diff.in:403 +#: ../quilt/diff.in:386 msgid "File %s is not being modified\\n" msgstr "" -#: ../quilt/diff.in:423 ../quilt/refresh.in:201 +#: ../quilt/diff.in:406 ../quilt/refresh.in:201 msgid "Diff failed, aborting\\n" msgstr "" -#: ../quilt/diff.in:430 +#: ../quilt/diff.in:413 msgid "More recent patches modify files in patch %s\\n" msgstr "" diff --git a/quilt.changes b/quilt.changes index 7c7c682..6b544fc 100644 --- a/quilt.changes +++ b/quilt.changes @@ -1,4 +1,9 @@ ------------------------------------------------------------------- +Mon Jun 27 09:54:53 CEST 2005 - agruen@suse.de + +- quilt diff: Fix -z option if QUILT_PATCHES is an absolute path. + +------------------------------------------------------------------- Sun Jun 26 23:37:23 CEST 2005 - agruen@suse.de - Jean Delvare: diff --git a/quilt/diff.in b/quilt/diff.in index 3840034..2f96689 100644 --- a/quilt/diff.in +++ b/quilt/diff.in @@ -335,16 +335,10 @@ then patch_file=$(patch_file_name $last_patch) patch_args=$(patch_args $last_patch) workdir=$(gen_tempfile -d $PWD/quilt) - pwd=$PWD - if ! cd $QUILT_PC/$last_patch - then - printf $"Cannot change into directory %s\n" \ - "$QUILT_PC/$last_patch" >&2 - die 1 - fi if [ ${#files[@]} -gt 0 ] \ - && ! cp -l --parents "${files[@]}" $workdir/ + && ! ( cd $QUILT_PC/$last_patch && + cp -l --parents "${files[@]}" $workdir/ ) then printf $"Failed to copy files to temporary directory\n" >&2 die 1 @@ -355,16 +349,10 @@ then # them: We must remove them here. find $workdir -type f -size 0 -exec rm -f '{}' ';' - if ! cd $workdir - then - printf $"Cannot change to temporary directory\n" >&2 - die 1 - fi - - if [ -s $pwd/$patch_file ] + if [ -s $patch_file ] then - if ! cat_file $pwd/$patch_file \ - | @PATCH@ $QUILT_PATCH_OPTS $patch_args \ + if ! cat_file $patch_file \ + | @PATCH@ -d $workdir $QUILT_PATCH_OPTS $patch_args \ --no-backup-if-mismatch -Ef \ >/dev/null 2>/dev/null then @@ -373,18 +361,13 @@ then # applied, we know that it won't apply cleanly. In # all other cases, print a warning. - if [ ! -e $pwd/$QUILT_PC/$last_patch~refresh -a \ + if [ ! -e $QUILT_PC/$last_patch~refresh -a \ ${#opt_files[@]} -eq 0 ] then printf $"Failed to patch temporary files\n" >&2 fi fi fi - if ! cd $pwd - then - printf $"Cannot change to source directory\n" >&2 - die 1 - fi fi for file in "${files[@]}" |