diff options
| author | Andreas Gruenbacher <agruen@suse.de> | 2003-01-30 16:26:21 +0000 |
|---|---|---|
| committer | Andreas Gruenbacher <agruen@suse.de> | 2003-01-30 16:26:21 +0000 |
| commit | baaf1091d9321bf4b8ed0f3e73cf4b47ca05463c (patch) | |
| tree | d71b453450a5c15656b8b2353321148d47b765bc | |
| parent | a3f2faa3f909a4f95367815d68d749c6c25a6596 (diff) | |
| download | quilt-baaf1091d9321bf4b8ed0f3e73cf4b47ca05463c.tar.gz | |
Quilt refresh looses patch description
| -rw-r--r-- | lib/patchfns.in | 2 | ||||
| -rw-r--r-- | quilt.changes | 2 | ||||
| -rw-r--r-- | quilt/refresh.in | 5 |
3 files changed, 7 insertions, 2 deletions
diff --git a/lib/patchfns.in b/lib/patchfns.in index b6dd5cf..f30ea13 100644 --- a/lib/patchfns.in +++ b/lib/patchfns.in @@ -582,7 +582,7 @@ patch_description() { local patch_file=$1 - if [ -e "$patch_file" ] + if [ -e "$patch_file" -o -z "$patch_file" ] then awk ' $1 == "---" { exit } diff --git a/quilt.changes b/quilt.changes index 9c6cc55..24849ad 100644 --- a/quilt.changes +++ b/quilt.changes @@ -11,6 +11,8 @@ Thu Jan 30 13:25:51 CET 2003 - agruen@suse.de This is required by POSIX, and is also used by diffstat. - Adjust patch_description documentation extraction function to check for Index: lines. +- Quilt refresh looses text before actual patch due to but in + patch_description function. ------------------------------------------------------------------- Tue Jan 28 23:41:19 CET 2003 - agruen@suse.de diff --git a/quilt/refresh.in b/quilt/refresh.in index 320b203..d21fbf8 100644 --- a/quilt/refresh.in +++ b/quilt/refresh.in @@ -190,7 +190,10 @@ else die 1 fi fi -status=$? +if [ $? -ne 0 ] +then + die 1 +fi rm -f $(pc_file_name $patch)~refresh echo "Refreshed patch $patch" |