From 05fef463d8c24b1cc9caf878c7da67f2661ce724 Mon Sep 17 00:00:00 2001 From: Clifford Wolf Date: Fri, 24 Sep 2004 13:36:13 +0000 Subject: [PATCH] Clifford Wolf: Also add dep info, etc when a package build fails ..the package could fail because of a shared file conflict or alike, we still want all the meta data in such cases. [2004092211214509119] (https://www.rocklinux.net/submaster) git-svn-id: http://www.rocklinux.org/svn/rock-linux/trunk@4414 c5f82cb5-29bc-0310-9cd0-bff59a50e3bc --- scripts/Build-Pkg | 30 +++++++++++------------------- 1 file changed, 11 insertions(+), 19 deletions(-) diff --git a/scripts/Build-Pkg b/scripts/Build-Pkg index 04b0d5276..7aa655bbb 100755 --- a/scripts/Build-Pkg +++ b/scripts/Build-Pkg @@ -413,28 +413,20 @@ if [ $this_is_the_2nd_run = 0 ] ; then ls ?-$xpkg.* 2> /dev/null ) echo - unset stagelevel - for x in 0 1 2 3 4 5 6 7 8 9 ; do - [ -f "$root/var/adm/logs/$x-$xpkg.log" ] && \ - stagelevel=$x - done + echo "[BUILDTIME] $buildtime ($stagelevel)" - if [ "$stagelevel" ] ; then - echo "[BUILDTIME] $buildtime ($stagelevel)" + x="$root/var/adm/packages/$xpkg" + if [ -f $x ]; then + echo "[SIZE] `grep "^Package Size: " \ + $x | cut -f3- -d' '`" + fi + echo - x="$root/var/adm/packages/$xpkg" - if [ -f $x ]; then - echo "[SIZE] `grep "^Package Size: " \ - $x | cut -f3- -d' '`" - fi + x="$root/var/adm/dependencies/$xpkg" + if [ "$pkg" != "rock-debug" -a -f $x ]; then + cut -f2- -d' ' "$x" | \ + fmt -70 | sed 's,^,[DEP] ,' echo - - x="$root/var/adm/dependencies/$xpkg" - if [ "$pkg" != "rock-debug" -a -f $x ]; then - cut -f2- -d' ' "$x" | \ - fmt -70 | sed 's,^,[DEP] ,' - echo - fi fi for stagelevel in 0 1 2 3 4 5 6 7 8 9 ; do