diff options
| author | Jean Delvare <khali@linux-fr.org> | 2005-09-09 16:16:35 +0000 |
|---|---|---|
| committer | Jean Delvare <khali@linux-fr.org> | 2005-09-09 16:16:35 +0000 |
| commit | dc5babe944639e0404a7fce2f2e64155d0271e89 (patch) | |
| tree | 2a9c9dc3900d86d2ed592aa9dd3cb55989a9f414 | |
| parent | 35ca0a1fb609eeba0244f72b404611a5ef5a8024 (diff) | |
| download | quilt-dc5babe944639e0404a7fce2f2e64155d0271e89.tar.gz | |
- scripts/patchfns.in: New quilt_command function for running another
quilt command.
- quilt/delete.in, quilt/edit.in: Use the new quilt_command function.
Patch from Joe Green.
| -rw-r--r-- | quilt.changes | 9 | ||||
| -rw-r--r-- | quilt/delete.in | 2 | ||||
| -rw-r--r-- | quilt/edit.in | 4 | ||||
| -rw-r--r-- | scripts/patchfns.in | 8 |
4 files changed, 20 insertions, 3 deletions
diff --git a/quilt.changes b/quilt.changes index 38d3ad0..889f18e 100644 --- a/quilt.changes +++ b/quilt.changes @@ -1,3 +1,12 @@ +------------------------------------------------------------------- +Fri Sep 9 18:09:42 CEST 2005 - khali@linux-fr.org + +- scripts/patchfns.in: New quilt_command function for running + another quilt command. Patch from Joe Green. +- quilt/delete.in, quilt/edit.in: Use the new quilt_command + function. Patch from Joe Green. + +------------------------------------------------------------------- Wed Sep 7 18:22:29 CEST 2005 - khali@linux-fr.org - quilt/delete.in: Fix the quilt pop invocation when attempting diff --git a/quilt/delete.in b/quilt/delete.in index 3138f9f..1b787e5 100644 --- a/quilt/delete.in +++ b/quilt/delete.in @@ -113,7 +113,7 @@ fi if is_applied $patch then if [ "$patch" != "$(top_patch)" ] || \ - ! QUILT_COMMAND= @BASH@ $BASH_OPTS -c ". @QUILT@/pop" "quilt pop" -fq + ! quilt_command pop -fq then printf $"Patch %s is currently applied\n" \ "$(print_patch $patch)" >&2 diff --git a/quilt/edit.in b/quilt/edit.in index eadf821..4480f7f 100644 --- a/quilt/edit.in +++ b/quilt/edit.in @@ -59,7 +59,7 @@ then usage fi -bash -c ". @QUILT@/add" "quilt add" "$@" +quilt_command add "$@" status=$? if [ $status -ne 0 -a $status -ne 2 ] then @@ -71,7 +71,7 @@ for file in "$@" do if ! [ -e "$file" ] then - bash -c ". @QUILT@/remove" "quilt remove" "$file" + quilt_command remove "$file" status=1 fi done diff --git a/scripts/patchfns.in b/scripts/patchfns.in index 98f5c51..89fd216 100644 --- a/scripts/patchfns.in +++ b/scripts/patchfns.in @@ -748,6 +748,14 @@ setup_colors() eval $C } +quilt_command () +{ + local command=$1 + shift + + QUILT_COMMAND="" @BASH@ $BASH_OPTS -c ". @QUILT@/$command" "quilt $command" "$@" +} + # # If the working directory does not contain a $QUILT_PATCHES directory, # quilt searches for its base directory up the directory tree. If no |