diff options
| author | Andreas Gruenbacher <agruen@suse.de> | 2003-10-21 23:44:22 +0000 |
|---|---|---|
| committer | Andreas Gruenbacher <agruen@suse.de> | 2003-10-21 23:44:22 +0000 |
| commit | c68dbc731f073e0385d2f235f767dbda713b0806 (patch) | |
| tree | 7b0e752def704bb844fdee66517d78f7615ac618 /scripts/patchfns.in | |
| parent | 8da5f17fc3eb9fc621bea4a5482bc3995b56c9da (diff) | |
| download | quilt-c68dbc731f073e0385d2f235f767dbda713b0806.tar.gz | |
- `Quilt fork' should better fork the next patch instead of the
topmost one. Also fix a bug in updating the series file when
forking. The rename_in_db() function is no longer needed.
Diffstat (limited to 'scripts/patchfns.in')
| -rw-r--r-- | scripts/patchfns.in | 23 |
1 files changed, 1 insertions, 22 deletions
diff --git a/scripts/patchfns.in b/scripts/patchfns.in index 1aab136..0de9c85 100644 --- a/scripts/patchfns.in +++ b/scripts/patchfns.in @@ -226,8 +226,8 @@ rename_in_series() /^'"$(quote_re $from)"'(|\.patch|\.diff?)(|\.gz|\.bz2)([ \t]|$)/ \ { sub(/'"$(quote_re $from)(|\.patch|\.diff?)(|\.gz|\.bz2)"'/, "'"${to//\"/\\\"}"'") - print good=1 } + { print } END { exit(! good) } ' $SERIES > $tmpfile if [ $? -eq 0 ] @@ -487,27 +487,6 @@ remove_from_db() fi } -rename_in_db() -{ - local from=$1 to=$2 - local tmpfile - tmpfile=$(gen_tempfile) || return 1 - /usr/bin/gawk ' - /^'"$(quote_re $from)"'$/ \ - { sub(/'"$(quote_re $from)"'/, "'"${to//\"/\\\"}"'") - print - good=1 } - END { exit(! good) } - ' $DB > $tmpfile - if [ $? -eq 0 ] - then - mv -f $tmpfile $DB - else - rm -f $tmpfile - return 1 - fi -} - stripit() { if [ -n "$1" ] |