diff options
| author | Jean Delvare <khali@linux-fr.org> | 2005-08-26 08:36:15 +0000 |
|---|---|---|
| committer | Jean Delvare <khali@linux-fr.org> | 2005-08-26 08:36:15 +0000 |
| commit | 75e9d92478697b476c651825130532b7c3d18f67 (patch) | |
| tree | c6a600f40b1b9dcff0a12264fc800a2e068db3d6 | |
| parent | fdd56ea803c212f6ee4a146d40d72f9531b5175b (diff) | |
| download | quilt-75e9d92478697b476c651825130532b7c3d18f67.tar.gz | |
Fix error path when imported patch doesn't exist.
| -rw-r--r-- | quilt.changes | 6 | ||||
| -rw-r--r-- | quilt/import.in | 4 |
2 files changed, 7 insertions, 3 deletions
diff --git a/quilt.changes b/quilt.changes index 8829a26..6b3c100 100644 --- a/quilt.changes +++ b/quilt.changes @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Fri Aug 26 10:29:55 CEST 2005 - khali@linux-fr.org + +- quilt/import.in: Fix error path when imported patch doesn't + exist. + +------------------------------------------------------------------- Wed Aug 24 16:53:44 CEST 2005 - agruen@suse.de - quilt/edit.in: Check exit status after adding files, and fail diff --git a/quilt/import.in b/quilt/import.in index 4965c66..c840c78 100644 --- a/quilt/import.in +++ b/quilt/import.in @@ -78,7 +78,6 @@ fi [ -n "$opt_strip" ] && patch_args="-p$opt_strip" -status= for patch_file in "$@" do if [ -n "$opt_patch" ] @@ -114,7 +113,7 @@ do if ! cp "$patch_file" "$dest" then printf $"Failed to import patch %s\n" "$(print_patch $patch)" >&2 - status=1 + exit 1 fi if ! patch_in_series $patch && @@ -128,7 +127,6 @@ do rm -rf $QUILT_PC/$patch done -exit $status ### Local Variables: ### mode: shell-script ### End: |