From a45c236ebd620ccd7c0e26d73d9dc80367a54b25 Mon Sep 17 00:00:00 2001
From: Clifford Wolf <clifford@clifford.at>
Date: Tue, 21 Dec 2004 04:44:54 +0000
Subject: [PATCH] Clifford Wolf: 	Fixes related to extra versions in
 .gem filenames 	.. and minor fixes in Build-Target output

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



git-svn-id: http://www.rocklinux.org/svn/rock-linux/trunk@5263 c5f82cb5-29bc-0310-9cd0-bff59a50e3bc
---
 scripts/Build-Target | 6 +++---
 scripts/functions    | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/scripts/Build-Target b/scripts/Build-Target
index 6986333a2..446eddb87 100755
--- a/scripts/Build-Target
+++ b/scripts/Build-Target
@@ -224,7 +224,7 @@ fi
 			sleep 1
 		done
 
-		echo "All packages build."
+		echo "All packages built."
 		sleep 2; rm -rf $qdir
 	else
 	    if [ "$build_only_this_job" ] ; then
@@ -254,7 +254,7 @@ fi
 	if [ $ROCKCFG_PKGFILE_VER = 1 ] ; then
 		while read p; do
 			v=$( grep -h '^Package Name and Version:' build/$ROCKCFG_ID/var/adm/packages/$p:* \
-				build/$ROCKCFG_ID/var/adm/packages/$p 2> /dev/null | cut -f6 -d' ' | head -n1 )
+				build/$ROCKCFG_ID/var/adm/packages/$p 2> /dev/null | cut -f6,7 -d' ' | tr ' ' - | head -n1 )
 			echo "$p-$v"
 		done
 	else
@@ -426,7 +426,7 @@ build_target_exit() {
 
 	echo_status "Killing liggering processes and removing parallel build queue."
 	rm -rf $build_rock/queue
-	fuser -k ${build_logs}/*.log
+	fuser -k ${build_logs}/*.log &> /dev/null
 	sleep 2
 
 	echo_status "Umounting liggering mounts in build/$ROCKCFG_ID."
diff --git a/scripts/functions b/scripts/functions
index 6818d636c..30024de91 100644
--- a/scripts/functions
+++ b/scripts/functions
@@ -524,7 +524,7 @@ create_package_db() {
 
 		if [ "$ROCKCFG_PKGFILE_VER" = 1 ] ; then
 			v=-$(grep '^Package Name and Version' \
-                                $1/packages/$pkg | cut -f6 -d' ')
+                                $1/packages/$pkg | cut -f6,7 -d' ' | tr ' ' -)
 		else
 			v=""
 		fi