From 1d1c7a5f517811010c93a953fa8f6bce9a76b479 Mon Sep 17 00:00:00 2001
From: Rene Rebe <rene.rebe@gmx.net>
Date: Sat, 30 Aug 2003 12:25:04 +0000
Subject: [PATCH] fixed cretae_package_db to list errors correctly removed the
 missing binary check since it is now done in create_package_db

git-svn-id: http://www.rocklinux.org/svn/rock-linux/trunk@1257 c5f82cb5-29bc-0310-9cd0-bff59a50e3bc
---
 Documentation/Developers/CHANGELOG-RENE |  2 ++
 scripts/Build-Target                    | 13 +--------
 scripts/functions                       | 39 +++++++++++++------------
 target/generic/build.sh                 |  2 +-
 target/reference/build.sh               |  2 +-
 5 files changed, 26 insertions(+), 32 deletions(-)

diff --git a/Documentation/Developers/CHANGELOG-RENE b/Documentation/Developers/CHANGELOG-RENE
index 15d83ee90..facdc0ad8 100644
--- a/Documentation/Developers/CHANGELOG-RENE
+++ b/Documentation/Developers/CHANGELOG-RENE
@@ -13,6 +13,8 @@
    file
  - Tobias C. Rittweiler and Rene Rebe: added editor search to the gui_* STONE
                                        modules
+ - fixed cretae_package_db to list errors correctly
+ - removed the missing binary check since it is now done in create_package_db
 
 *) 2003-08-29 (2.0.0-rc1 - 2.0.0-rc2)
 
diff --git a/scripts/Build-Target b/scripts/Build-Target
index cbf8b0b10..41bd34671 100755
--- a/scripts/Build-Target
+++ b/scripts/Build-Target
@@ -194,24 +194,13 @@ fi
 	fi
 
 	local pkglst=`mktemp` errors=0; rm -f src/invalid-files.lst
-	echo_header "Searching for missing or liggering old files ..."
+	echo_header "Searching for old liggering files ..."
 	grep "^X" config/$config/packages |
 	if [ $ROCKCFG_PKGFILE_VER = 1 ] ; then
 		cut -d' ' -f5-6 | sed "s/ /-/"
 	else
 		cut -d' ' -f5
 	fi > $pkglst
-	for x in `cat $pkglst` ; do
-		if [ $ROCKCFG_CREATE_TARBZ2 = 1 -a \
-				! -s build/$ROCKCFG_ID/pkgs/$x.tar.bz2 ] ||
-		   [ $ROCKCFG_CREATE_GEM = 1 -a \
-				! -s build/$ROCKCFG_ID/pkgs/$x.gem ]
-		then
-			x="build/$ROCKCFG_ID/pkgs/$x"	
-			echo_error "Binary package $x is missing!"
-			errors=1
-		fi
-	done
 	for file in $( ls build/$ROCKCFG_ID/pkgs/ ) ; do
 		x="$file"
 		[ $ROCKCFG_CREATE_GEM = 0 ] || x=${x%.gem}
diff --git a/scripts/functions b/scripts/functions
index 4eee757bc..a3492d725 100644
--- a/scripts/functions
+++ b/scripts/functions
@@ -367,47 +367,50 @@ register_wm() {
 # Register an application
 #
 register_application() {
-	[ -e /usr/share/rock-registry/app ] || mkdir -p /usr/share/rock-registry/app
+	[ -e /usr/share/rock-registry/app ] \
+		|| mkdir -p /usr/share/rock-registry/app
 	echo -e "name=\"$2\"\nexec=\"$3\"\n" > /usr/share/rock-registry/app/$1
 }
 
 # Create Package Database for gasgui install tool
 #
 create_package_db() {
-	for pkg in $( ls -dr $1/descs/?* ) ; do
+	for file in $( ls -dr $1/descs/?* ) ; do
+		pkg="${file##*/}"
 		# only include the package if a binary file is available
+
 		if [ "$ROCKCFG_PKGFILE_VER" = 1 ] ; then
 			v=-$(grep '^Package Name and Version' \
-                                /var/adm/packages/$pkg | cut -f6 -d' ')
+                                $1/packages/$pkg | cut -f6 -d' ')
 		else
 			v=""
 		fi
 		if [ "$ROCKCFG_CREATE_GEM" = 1 ] ; then
-			file=$(pkg)$(v).gem
+			bfile=${pkg}${v}.gem
 		else
-			file=$(pkg)$(v).tar.bz2
+			bfile=${pkg}${v}.tar.bz2
 		fi
 
-		if [ -e $file ] ; then
-			pkg="${pkg##*/}"
+		if [ -e $2/$bfile ] ; then
 			[ "$pkg" = TRANS.TBL ] && continue
 
-			echo -e "$pkg"
-			echo -e "\027"
+			( echo -e "$pkg"
+			  echo -e "\027"
 
-			cat $1/descs/$pkg
-			echo -e "\027"
+			  cat $1/descs/$pkg
+			  echo -e "\027"
 
-			cat $1/dependencies/$pkg
-			echo -e "\027"
+			  cat $1/dependencies/$pkg
+			  echo -e "\027"
 
-			cat $1/cksums/$pkg
-			echo -e "\027"
+			  cat $1/cksums/$pkg
+			  echo -e "\027" ) > $3.tmp
 		else
-			echo_error "Binary file $file not present."
-			echo error "Skipped in package database."
+			echo_error "Binary file for $bfile not present." \
+			           "Skipped in package database."
 		fi
-	done | gzip
+	done
+	gzip -c $3.tmp > $3 ; rm -f $3.tmp
 }
 
 # Add files to the 'badfiles' list
diff --git a/target/generic/build.sh b/target/generic/build.sh
index d85658f6a..1e4a77b64 100755
--- a/target/generic/build.sh
+++ b/target/generic/build.sh
@@ -10,7 +10,7 @@ echo_header "Finishing build."
 echo_status "Creating package database ..."
 admdir="build/${ROCKCFG_ID}/root/var/adm"
 create_package_db $admdir build/${ROCKCFG_ID}/pkgs \
-                  > build/${ROCKCFG_ID}/packages.db
+                  build/${ROCKCFG_ID}/packages.db
 
 echo_status "Creating isofs.txt file .."
 cat << EOT > build/${ROCKCFG_ID}/isofs.txt
diff --git a/target/reference/build.sh b/target/reference/build.sh
index 334cd920f..500f56faa 100644
--- a/target/reference/build.sh
+++ b/target/reference/build.sh
@@ -40,7 +40,7 @@ cp $build_root/var/adm/logs/*.err $build_result/errors/
 echo_status "Creating package database ..."
 admdir="build/${ROCKCFG_ID}/root/var/adm"
 create_package_db $admdir build/${ROCKCFG_ID}/pkgs \
-                  > build/${ROCKCFG_ID}/packages.db
+                  build/${ROCKCFG_ID}/packages.db
 
 echo_status "Creating isofs.txt file .."
 cat << EOT > build/${ROCKCFG_ID}/isofs.txt