From 4fb9a7f50119c55a33d698f4b546816f105e931a Mon Sep 17 00:00:00 2001 From: Clifford Wolf Date: Thu, 17 Jun 2004 10:54:00 +0000 Subject: [PATCH] Clifford Wolf: Some Create-ErrList changes: * Removed -real option * -updated now also shows updated packages which didn't fail * Added -showdepc option for dependency counters [2004061211165007284] (https://www.rocklinux.net/submaster) git-svn-id: http://www.rocklinux.org/svn/rock-linux/trunk@3294 c5f82cb5-29bc-0310-9cd0-bff59a50e3bc --- scripts/Create-ErrList | 42 +++++++++++++++++++++--------------------- 1 file changed, 21 insertions(+), 21 deletions(-) diff --git a/scripts/Create-ErrList b/scripts/Create-ErrList index 8eae3bcfb..8b2c11959 100755 --- a/scripts/Create-ErrList +++ b/scripts/Create-ErrList @@ -26,11 +26,11 @@ config=default repstat=0 showerr=0 showtree=0 +showdepc=0 delete=0 remove=0 fulldelete=0 newdelete=0 -onlyreal=0 onlyupdated=0 repository="" @@ -53,6 +53,9 @@ while [ "$1" ] ; do -showtree) showtree=1 ; shift ;; + -showdepc) + showdepc=1 ; shift ;; + -repository) if [ $2 != '!' ] ; then repository=" $2 " ; shift ; shift @@ -96,9 +99,6 @@ while [ "$1" ] ; do -newdelete) newdelete=1 ; shift ;; - -real) - onlyreal=1 ; shift ;; - -updated) onlyupdated=1 ; shift ;; @@ -107,7 +107,7 @@ x="${0//?/ }" ; x="${x# }" echo "Usage: $0 [ -cfg config ] [ -repository repository ] \\" echo " $x [ -copydir copydir | -movedir movedir ] [ -repstat ] \\" echo " $x [ -stage stage ] [ -logdir logdir ] [ -[full|new]delete ] \\" -echo " $x [ -real ] [ -updated ] [ -showerr [ -showtree ] | ]" +echo " $x [ -updated ] [ -showerr [ -showtree ] [ -showdepc ] | ]" exit 1 ;; *) @@ -197,28 +197,28 @@ for stagelevel in $( echo $stages | tr -d '[]' | sed 's,.,& ,g' ) ; do while read x x x tree pkg x ; do [ "$repository" -a \ "${repository/ $tree /}" = "$repository" ] && continue - if [ -f "$logdir/$stagelevel-$pkg.err" ] ; then + + this_is_error=0 + if [ $onlyupdated != 0 ] ; then + [ "$( bash scripts/xfind.sh package/*/$pkg -newer "$logdir/$stagelevel-$pkg.err" -o -newer "$logdir/$stagelevel-$pkg.log" )" ] && this_is_error=1 + elif [ -f "$logdir/$stagelevel-$pkg.err" ] ; then this_is_error=1 - if [ $onlyreal != 0 ] ; then - [ -f "$pkgdir/$pkg" ] && this_is_error=0 - fi - if [ $onlyupdated != 0 -a $this_is_error != 0 ] ; then - [ "$( bash scripts/xfind.sh package/*/$pkg download/*/$pkg -newer "$logdir/$stagelevel-$pkg.err" )" ] || this_is_error=0 - fi - else - this_is_error=0 fi if [ $this_is_error = 1 ] ; then if [ $showerr = 0 ] ; then - d=$( ./scripts/Check-Deps-3 $stagelevel \ - $pkg config/$config/packages | \ - cut -f3 -d' ' | sort -u | wc -l ) - d="$( printf "%3d" $d )" - echo "[$stagelevel] $d ${tree:0:13}/${pkg:0:18}" + if [ $showdepc != 0 ]; then + d=$( ./scripts/Check-Deps-3 $stagelevel \ + $pkg config/$config/packages | \ + cut -f3 -d' ' | sort -u | wc -l ) + d="$( printf " %3d" $d )" + else + d="" + fi + echo "[$stagelevel]$d ${tree:0:13}/${pkg:0:18}" else - echo ; echo "== $stagelevel-$pkg.err ==" - tail -n 20 "$logdir/$stagelevel-$pkg.err" | \ + echo ; echo "== $stagelevel-$pkg.* ==" + tail -n 20 "$logdir/$stagelevel-$pkg".* | \ tac | perl -e ' my @lines; my $counter;