diff options
| author | Jean Delvare <jdelvare@suse.de> | 2012-12-05 14:53:15 +0100 |
|---|---|---|
| committer | Jean Delvare <jdelvare@suse.de> | 2012-12-05 14:53:15 +0100 |
| commit | 4fef9e3c656b7bdf5d56a8f19163389f58c5ca1a (patch) | |
| tree | 44f05e269ad286ef26312039aaec1b6a8f432811 | |
| parent | 8fc2c986c73bbf838bf0499319fc4cac9de9e90e (diff) | |
| download | quilt-4fef9e3c656b7bdf5d56a8f19163389f58c5ca1a.tar.gz | |
push: Fix variable usage in interrupt
While bash allows poking at a function caller's variables, that's
not something we normally do in quilt.
| -rw-r--r-- | quilt.changes | 5 | ||||
| -rw-r--r-- | quilt/push.in | 4 |
2 files changed, 8 insertions, 1 deletions
diff --git a/quilt.changes b/quilt.changes index 978d1fd..cac0702 100644 --- a/quilt.changes +++ b/quilt.changes @@ -1,4 +1,9 @@ ------------------------------------------------------------------- +Wed Dec 5 14:43:58 CET 2012 - jdelvare@suse.de + +- push: Fix variable usage in interrupt. + +------------------------------------------------------------------- Wed Dec 5 14:42:33 CET 2012 - bpoirier@suse.de - Fix handling of patch files with ':' in their name. diff --git a/quilt/push.in b/quilt/push.in index eeb901c..6eefa2e 100644 --- a/quilt/push.in +++ b/quilt/push.in @@ -62,7 +62,9 @@ be used. interrupt() { - rollback_patch $1 + local patch=$1 + + rollback_patch $patch printf $"Interrupted by user; patch %s was not applied.\n" \ "$(print_patch $patch)" >&2 exit 1 |