diff options
author | Michael Olbrich <m.olbrich@pengutronix.de> | 2009-11-23 12:50:33 +0100 |
---|---|---|
committer | Michael Olbrich <m.olbrich@pengutronix.de> | 2009-11-23 15:17:45 +0100 |
commit | 792ab0e93ade4d4beae141f05ef37d7ba633ad6e (patch) | |
tree | af0a65c7876fd8784c0123bbd5021a85d824c06d /plugins | |
parent | 046d09461c5b0b0f4dc34b68f09faf2dbbe2e7a6 (diff) | |
download | ptxdist-792ab0e93ade4d4beae141f05ef37d7ba633ad6e.tar.gz ptxdist-792ab0e93ade4d4beae141f05ef37d7ba633ad6e.tar.xz |
[url_check] output cleanup and speed improvements
- only print verbose error if _all_ urls of a packet are broken.
- query all urls with one ptxdist call
Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
Diffstat (limited to 'plugins')
-rwxr-xr-x | plugins/url_check/main | 37 |
1 files changed, 24 insertions, 13 deletions
diff --git a/plugins/url_check/main b/plugins/url_check/main index 8a4985117..09d437a26 100755 --- a/plugins/url_check/main +++ b/plugins/url_check/main @@ -216,30 +216,41 @@ init(){ } create_url_list(){ - echo "creating list of download URLS for `echo $PACKAGES | wc -w` packages (This may take a while!)" - for target in $PACKAGES; do - $PTXDIST print ${target}_URL 2>> $TMPDIR/errors | sed -e 's/ */\n/' >> $TMPDIR/urllist - echo -n "." - done + echo "creating list of download URLS for `echo $PACKAGES | wc -w` packages" + targets=`for target in $PACKAGES; do echo print-${target}_URL; done | sort -u` + $PTXDIST make -i ${targets} 2>> $TMPDIR/errors > $TMPDIR/urllist echo "done" } test_urls(){ egrep -v "^#|^$|^[[:space:]]" $TMPDIR/urllist \ | while read line; do - $URL_CHECKER $line >$TMPDIR/errormsg 2>&1 - case $? in - 0) + local count_ok=0 + local count_fail=0 + rm -f $TMPDIR/errormsg + for url in $line; do + $URL_CHECKER $url >>$TMPDIR/errormsg 2>&1 + case $? in + 0) + count_ok=$[count_ok+1] + ;; + *) + count_fail=$[count_fail+1] + ;; + esac + done + if [ $count_fail -eq 0 ]; then echo " [ OK ] $line" - ;; - *) - echo "" + elif [ $count_ok -eq 0 ]; then echo " [ FAIL ] $line" echo "" + echo "" $CAT $TMPDIR/errormsg | $GREP -A 10 "Start checking at" echo "" - ;; - esac + else + local count=$[count_ok+$count_fail] + echo " [ $count_ok/$count ] $line" + fi done } |