diff options
| -rw-r--r-- | po/de.po | 1 | ||||
| -rw-r--r-- | quilt.changes | 11 | ||||
| -rw-r--r-- | quilt/add.in | 2 | ||||
| -rw-r--r-- | quilt/edit.in | 7 |
4 files changed, 14 insertions, 7 deletions
@@ -606,6 +606,7 @@ msgid "Usage: quilt import [-f] [-p num] [-n patch] patchfile ...\\n" msgstr "Verwendung: quilt import [-f] [-p num] [-n patch] [patchdatei] ...\\n" #: quilt/import.in:25 +#, fuzzy msgid "" "\n" "Import external patches. The patches will be inserted following the\n" diff --git a/quilt.changes b/quilt.changes index ada79b0..8829a26 100644 --- a/quilt.changes +++ b/quilt.changes @@ -1,13 +1,14 @@ ------------------------------------------------------------------- -Mon Aug 22 23:15:18 CEST 2005 - agruen@suse.de +Wed Aug 24 16:53:44 CEST 2005 - agruen@suse.de -- quilt/fold.in: fold did not work when invoked from a - subdirectory; update test case. +- quilt/edit.in: Check exit status after adding files, and fail + except when files have already been added. ------------------------------------------------------------------- -Wed Aug 17 12:19:25 CEST 2005 - agruen@suse.de +Mon Aug 22 23:15:18 CEST 2005 - agruen@suse.de -- quilt/edit.in: Check exit status after adding files. +- quilt/fold.in: fold did not work when invoked from a + subdirectory; update test case. ------------------------------------------------------------------- Fri Aug 12 20:28:59 CEST 2005 - khali@linux-fr.org diff --git a/quilt/add.in b/quilt/add.in index 17a7b08..f1080db 100644 --- a/quilt/add.in +++ b/quilt/add.in @@ -120,7 +120,7 @@ do then printf $"File %s is already in patch %s\n" \ "$SUBDIR$file" "$(print_patch $patch)" >&2 - status=2 + [ $status -ne 1 ] && status=2 continue fi next_patch=$(next_patch_for_file $patch $SUBDIR$file) diff --git a/quilt/edit.in b/quilt/edit.in index d8473de..0b3a169 100644 --- a/quilt/edit.in +++ b/quilt/edit.in @@ -48,7 +48,12 @@ then usage fi -bash -c ". @QUILT@/add" "quilt add" "$@" || exit $? +bash -c ". @QUILT@/add" "quilt add" "$@" +status=$? +if [ $status -ne 0 -a $status -ne 2 ] +then + exit $status +fi $EDITOR "$@" status=$? for file in "$@" |