From 473ec90e5394af35651f875e940f849ee722e4e2 Mon Sep 17 00:00:00 2001
From: kueller <kueller@504e572c-2e33-0410-9681-be2bf7408885>
Date: Mon, 20 Apr 2009 17:45:02 +0000
Subject: [PATCH] SHNAME wird jetzt korrekt gesetzt, bevor die Daten in
 /var/install/contents landen. Korrektur bei der Erzugung von FS=<md5sum>, so
 dass mehrfachtreffer in *.md5 keine Fehler mehr erzeugen

git-svn-id: svn://svn.compuextreme.de/Viitor/V962/ViitorMake@4598 504e572c-2e33-0410-9681-be2bf7408885
---
 genpkg | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/genpkg b/genpkg
index b4cd93c..0051737 100755
--- a/genpkg
+++ b/genpkg
@@ -445,13 +445,18 @@ pkggen() {
 			        grep ModuleName $DISTTARGET/$SRCPATH/$PKGNAME.meta|\
 				awk '{print $2}' \
 				>$ROOT/var/install/$PKGNAME/shortname
-										                	fi
+			fi
+			SHNAME=`cat $ROOT/var/install/$PKGNAME/shortname`
 			for k in bin dev man; do
 				if [ -f /var/install/tmp/$$/$k.tar ]; then
 					if [ -f /var/install/tmp/$$/$k.frg ]; then
 						exec 5</var/install/tmp/$$/$k.frg
 						while read <&5 FILE TYP RIGHT OWNER GROUP; do
-							MD5SUM=`grep $FILE $ROOT/var/install/tmp/$$/$k.md5|awk '{print $1}'`
+							if [ `fgrep $FILE $ROOT/var/install/tmp/$$/$k.md5|wc -l` -gt 1 ]; then
+								MD5SUM=`grep ${FILE}$ $ROOT/var/install/tmp/$$/$k.md5|awk '{print $1}'`
+							else 
+								MD5SUM=`fgrep ${FILE} $ROOT/var/install/tmp/$$/$k.md5|awk '{print $1}'`
+							fi
 							echo "PN=$SHNAME;FN=$FILE;FT=$TYP;FR=$RIGHT;FO=$OWNER;FG=$GROUP;FS=$MD5SUM;PK=$PKGNAME" >>/var/install/contents
 						done
 						exec 5<&-