From af5bebdd7e25a9dda046aa7212d6eb518a5e80e8 Mon Sep 17 00:00:00 2001 From: Stefan Fiedler Date: Mon, 12 May 2008 09:55:11 +0000 Subject: [PATCH] Stefan Fiedler: scripts/Create-PkgUpdPatch: fix for updates where old and new version are similar, eg. 2.6.23.1 and 2.6.23.12 [2007122122372314196] (https://www.rocklinux.net/submaster) git-svn-id: http://www.rocklinux.org/svn/rock-linux/trunk@8984 c5f82cb5-29bc-0310-9cd0-bff59a50e3bc --- scripts/Create-PkgUpdPatch | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/scripts/Create-PkgUpdPatch b/scripts/Create-PkgUpdPatch index bf1ae9df4..b4b38e318 100755 --- a/scripts/Create-PkgUpdPatch +++ b/scripts/Create-PkgUpdPatch @@ -104,9 +104,10 @@ while read x ; do tmpfile=`mktemp` ; tmpfile2=`mktemp` [ "$oldver" == "$newver" ] && continue echo "Upgrade Patch for $pkg ($pkgdir): $oldver -> $newver" - sed -e"s/^\[\(D\|DOWN\|DOWNLOAD\)\] [0-9]\+ \(.*\)$oldver\(.*\)/[\1] 0 \2$newver\3/" \ - -e"s/${oldver//./\\.}/$newver/g" -e"s/^\(\[V\] $newver\) .*/\1/" \ + sed -e"s/^\[\(D\|DOWN\|DOWNLOAD\)\] [0-9]\+ \(.*\)$oldver\(.*\)/[\1] 0 \2__newver__\3/" \ + -e"s/${oldver//./\\.}/__newver__/g" -e"s/^\(\[V\] __newver__\) .*/\1/" \ < $pkgdir/$pkg.desc > $tmpfile + sed -i -e"s,__newver__,$newver,g" $tmpfile diff -u ./$pkgdir/$pkg.desc $tmpfile | tee $tmpfile2 [ -s $tmpfile2 ] || echo "Patch for '$x' is empty!" >&2