From 9f4c6dd1f099fe2967a0364a11290f2882e46ec9 Mon Sep 17 00:00:00 2001
From: Clifford Wolf <clifford@clifford.at>
Date: Tue, 18 Oct 2005 14:38:44 +0000
Subject: [PATCH] Clifford Wolf, Blindcoder: 	Fixed Create-ErrList
 -newdelete for split packages

[2005101813123515047] (https://www.rocklinux.net/submaster)



git-svn-id: http://www.rocklinux.org/svn/rock-linux/trunk@6509 c5f82cb5-29bc-0310-9cd0-bff59a50e3bc
---
 scripts/Create-ErrList | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/scripts/Create-ErrList b/scripts/Create-ErrList
index 33199b66f..20fd8ce2e 100755
--- a/scripts/Create-ErrList
+++ b/scripts/Create-ErrList
@@ -162,8 +162,11 @@ logdir="${logdir:-build/$ROCKCFG_ID/var/adm/logs}"
 pkgdir="${logdir%/*}/packages"
 
 if [ "$newdelete" = 1 ]; then
-	while read xpkg cksum1
+	while read xpkg
 	do
+		cksum1="$( grep '^ROCK Linux Package Source Checksum: ' \
+			build/$ROCKCFG_ID/var/adm/packages/$xpkg | cut -f6 -d' '; )"
+
 		if [ ! -f package/*/$xpkg/$xpkg.desc ]; then
 		    pkg="`grep "=$xpkg " config/$config/packages \
 			| awk '{ print $5; }'`"
@@ -171,20 +174,18 @@ if [ "$newdelete" = 1 ]; then
 		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 '$xpkg' for rebuild ..."
 			if [ "$dryrun" = 0 ]; then
-			    mine -rf -R build/$ROCKCFG_ID $xpkg
+			    mine -rfs -R build/$ROCKCFG_ID $xpkg
 			    rm -f build/$ROCKCFG_ID/var/adm/*/?-$xpkg.*
 			fi
 		fi
 	done < <(
-		grep -R '^ROCK Linux Package Source Checksum: ' \
-		     build/$ROCKCFG_ID/var/adm/packages |
-		tr '/:' '  ' | cut -f6,13 -d' '
+		cd build/$ROCKCFG_ID/var/adm/packages && ls | grep -v ':'
 	)
 	exit 0
 fi