diff options
author | Andreas Gruenbacher <agruen@suse.de> | 2004-08-13 17:53:37 +0000 |
---|---|---|
committer | Andreas Gruenbacher <agruen@suse.de> | 2004-08-13 17:53:37 +0000 |
commit | a2e57891f511745ee3589d1347cbaa2a65c6aae2 (patch) | |
tree | 633598c089df13814eff59057d7af5fe377b5d07 | |
parent | 30870bd7cd1daa0c3a68df5e8f08c1c44542d70d (diff) | |
download | quilt-a2e57891f511745ee3589d1347cbaa2a65c6aae2.tar.gz |
- setup command: detect errors when running ``rpm -bp'' and
improve the messages of ``quilt setup''.
-rw-r--r-- | po/de.po | 27 | ||||
-rw-r--r-- | po/fr.po | 10 | ||||
-rw-r--r-- | po/quilt.pot | 10 | ||||
-rw-r--r-- | quilt.changes | 6 | ||||
-rw-r--r-- | quilt/setup.in | 8 | ||||
-rw-r--r-- | scripts/inspect.in | 4 |
6 files changed, 59 insertions, 6 deletions
@@ -311,6 +311,21 @@ msgid "" "\tto specifying the first applied patch.\n" "\n" msgstr "" +"\n" +"Gibt eine Liste der Dateien aus, die der oberste oder angegebene Patch\n" +"beinhaltet.\n" +"\n" +"-a\tZeigt alle Dateien in allen angewandten Patches an.\n" +"\n" +"-l\tGibt auch die Patchnamen mit aus.\n" +"\n" +"-v\tAusführlichere, benutzerfreundliche Ausgabe.\n" +"\n" +"--combine patch\n" +"\tErzeige eine Liste für alle Patches zwischen dem angegebenen Patch und\n" +"\tdem obersten Patch am Stack. Der Patchname \\\"-\\\" entspricht dem\n" +"\tersten angewandten Patch.\n" +"\n" #: ../quilt/files.in:76 ../quilt/files.in:96 msgid "Patch %s is not in series file\\n" @@ -825,7 +840,17 @@ msgstr "Verzeichnis %s existiert\\n" msgid "File %s exists\\n" msgstr "Datei %s existiert\\n" -#: ../quilt/setup.in:151 +#: ../quilt/setup.in:118 +msgid "The %%prep section of %s failed; results may be incomplete\\n" +msgstr "" +"Der %%prep-Abschnitt von %s ist fehlgeschlagen; die Ergebnisse sind " +"möglicherweise unvollständig\\n" + +#: ../quilt/setup.in:121 +msgid "The -v option will show rpm's output\\n" +msgstr "Die Option -v zeigt die Ausgaben von rpm an\\n" + +#: ../quilt/setup.in:155 msgid "Unpacking archive %s\\n" msgstr "Entpacke Archiv %s\\n" @@ -850,7 +850,15 @@ msgstr "Le répertoire %s existe\\n" msgid "File %s exists\\n" msgstr "Le fichier %s existe\\n" -#: ../quilt/setup.in:151 +#: ../quilt/setup.in:118 +msgid "The %%prep section of %s failed; results may be incomplete\\n" +msgstr "" + +#: ../quilt/setup.in:121 +msgid "The -v option will show rpm's output\\n" +msgstr "" + +#: ../quilt/setup.in:155 msgid "Unpacking archive %s\\n" msgstr "Désarchivage de %s\\n" diff --git a/po/quilt.pot b/po/quilt.pot index 09c3038..f3c5fa7 100644 --- a/po/quilt.pot +++ b/po/quilt.pot @@ -597,7 +597,15 @@ msgstr "" msgid "File %s exists\\n" msgstr "" -#: ../quilt/setup.in:151 +#: ../quilt/setup.in:118 +msgid "The %%prep section of %s failed; results may be incomplete\\n" +msgstr "" + +#: ../quilt/setup.in:121 +msgid "The -v option will show rpm's output\\n" +msgstr "" + +#: ../quilt/setup.in:155 msgid "Unpacking archive %s\\n" msgstr "" diff --git a/quilt.changes b/quilt.changes index 296232c..774b837 100644 --- a/quilt.changes +++ b/quilt.changes @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Fri Aug 13 19:49:59 CEST 2004 - agruen@suse.de + +- setup command: detect errors when running ``rpm -bp'' and + improve the messages of ``quilt setup''. + +------------------------------------------------------------------- Wed Aug 11 14:28:59 CEST 2004 - agruen@suse.de - Merge improvement to files command from Dean Roehrich: Allow to diff --git a/quilt/setup.in b/quilt/setup.in index 94ed844..ef37773 100644 --- a/quilt/setup.in +++ b/quilt/setup.in @@ -113,9 +113,13 @@ case "$1" in *.spec) spec_file="$1" - if ! @SCRIPTS@/inspect $verbose "$spec_file" > $tmpfile + if ! @SCRIPTS@/inspect $verbose "$spec_file" 2>&1 > $tmpfile then - exit 1 + printf $"The %%prep section of %s failed; results may be incomplete\n" "$spec_file" + if [ -z "$verbose" ] + then + printf $"The -v option will show rpm's output\n" + fi fi ;; *) diff --git a/scripts/inspect.in b/scripts/inspect.in index 4fcfba3..d77b375 100644 --- a/scripts/inspect.in +++ b/scripts/inspect.in @@ -174,8 +174,10 @@ ln -s wrapper $tmpdir/bin/tar set -- @RPMBUILD@ echo -n "### ${1##*/}: " >&4 -"${RPM[@]}" --nodeps -bp "$specfile" < /dev/null > /dev/null +"${RPM[@]}" --nodeps -bp "$specfile" < /dev/null >&2 +status=$? echo >&4 +exit $status ### Local Variables: ### mode: shell-script ### End: |