From ea41098f7766d1a219a9f924e9a78257b16b5e39 Mon Sep 17 00:00:00 2001 From: "Juergen \"George\" Sawinski" Date: Thu, 15 Jul 2004 21:20:50 +0000 Subject: [PATCH] Juergen Sawinski: -fix "./scripts/Create-ErrList -newdelete" for forked packages (rediffed) [2004071404233327106] (https://www.rocklinux.net/submaster) git-svn-id: http://www.rocklinux.org/svn/rock-linux/trunk@3592 c5f82cb5-29bc-0310-9cd0-bff59a50e3bc --- scripts/Create-ErrList | 16 ++++++++++++---- 1 file changed, 12 insertions(+), 4 deletions(-) diff --git a/scripts/Create-ErrList b/scripts/Create-ErrList index f58026b78..92b1d6da8 100755 --- a/scripts/Create-ErrList +++ b/scripts/Create-ErrList @@ -121,14 +121,22 @@ logdir="${logdir:-build/$ROCKCFG_ID/var/adm/logs}" pkgdir="${logdir%/*}/packages" if [ "$newdelete" = 1 ]; then - while read pkg cksum1 + while read xpkg cksum1 do + if [ ! -f package/*/$xpkg/$xpkg.desc ]; then + pkg="`grep =$xpkg config/$config/packages \ + | awk '{ print $5; }'`" + pkg="${pkg%=*}" + else + pkg=$xpkg + fi + cksum2=$( md5sum package/*/$pkg/* 2> /dev/null | \ grep -v '\.cache$' | md5sum | cut -f1 -d' ' ) if [ "$cksum1" != "$cksum2" ]; then - echo "Scheduling package '$pkg' for rebuild ..." - mine -rf -R build/$ROCKCFG_ID $pkg - rm -f build/$ROCKCFG_ID/var/adm/*/?-$pkg.* + echo "Scheduling package '$xpkg' for rebuild ..." + mine -rf -R build/$ROCKCFG_ID $xpkg + rm -f build/$ROCKCFG_ID/var/adm/*/?-$xpkg.* fi done < <( grep '^ROCK Linux Package Source Checksum: ' \