From b0d2959b211baa981f6abb21122e674f46565ca6 Mon Sep 17 00:00:00 2001 From: Holger Levsen Date: Sat, 19 Dec 2015 12:31:02 +0100 Subject: reproducible archlinux+rpms: show log file size --- bin/reproducible_html_archlinux.sh | 4 +++- bin/reproducible_html_rpms.sh | 10 +++++----- 2 files changed, 8 insertions(+), 6 deletions(-) (limited to 'bin') diff --git a/bin/reproducible_html_archlinux.sh b/bin/reproducible_html_archlinux.sh index 11f62baa..1774127b 100755 --- a/bin/reproducible_html_archlinux.sh +++ b/bin/reproducible_html_archlinux.sh @@ -33,6 +33,7 @@ HTML_UNKNOWN=$(mktemp -t rhtml-archlinux-XXXXXXXX) HTML_BUFFER=$(mktemp -t rhtml-archlinux-XXXXXXXX) HTML_TARGET="" HTML_REPOSTATS=$(mktemp -t rhtml-archlinux-XXXXXXXX) +SIZE="" for REPOSITORY in $ARCHLINUX_REPOS ; do echo "$(date -u) - starting to analyse build results for '$REPOSITORY'." TOTAL=$(cat ${ARCHLINUX_PKGS}_$REPOSITORY | sed -s "s# #\n#g" | wc -l) @@ -127,7 +128,8 @@ for REPOSITORY in $ARCHLINUX_REPOS ; do echo " $(LANG=C TZ=UTC ls --full-time $ARCHBASE/$REPOSITORY/$PKG/build1.log | cut -d ' ' -f6 )" >> $HTML_BUFFER for LOG in build1.log build2.log ; do if [ -f $ARCHBASE/$REPOSITORY/$PKG/$LOG ] ; then - echo " $LOG" >> $HTML_BUFFER + get_filesize $ARCHBASE/$REPOSITORY/$PKG/$LOG + echo " $LOG ($SIZE)" >> $HTML_BUFFER else echo "  " >> $HTML_BUFFER fi diff --git a/bin/reproducible_html_rpms.sh b/bin/reproducible_html_rpms.sh index c8f77be3..cf16c6d9 100755 --- a/bin/reproducible_html_rpms.sh +++ b/bin/reproducible_html_rpms.sh @@ -16,7 +16,7 @@ ARCH="$2" # # analyse results to create the webpage # -echo "$(date -u) - starting to analyse build results." +echo "$(date -u) - starting to analyse build results for '$RELEASE' ($ARCH)." HTML_FTBFS=$(mktemp -t rhtml-rpms-XXXXXXXX) HTML_FTBR=$(mktemp -t rhtml-rpms-XXXXXXXX) HTML_DEPWAIT=$(mktemp -t rhtml-rpms-XXXXXXXX) @@ -26,9 +26,7 @@ HTML_UNKNOWN=$(mktemp -t rhtml-rpms-XXXXXXXX) HTML_BUFFER=$(mktemp -t rhtml-rpms-XXXXXXXX) HTML_TARGET="" HTML_RPM_STATS=$(mktemp -t rhtml-rpms-XXXXXXXX) - -echo "$(date -u) - starting to analyse build results for '$RELEASE' ($ARCH)." -TOTAL=$(cat ${RPM_PKGS}_$RELEASE | sed -s "s# #\n#g" | wc -l) +SIZE="" TESTED=0 NR_FTBFS=0 NR_FTBR=0 @@ -36,6 +34,7 @@ NR_DEPWAIT=0 NR_404=0 NR_GOOD=0 NR_UNKNOWN=0 +TOTAL=$(cat ${RPM_PKGS}_$RELEASE | sed -s "s# #\n#g" | wc -l) for PKG in $(find $RPMBASE/$RELEASE/$ARCH/* -maxdepth 1 -type d -exec basename {} \;|sort -u -f) ; do if [ -z "$(cd $RPMBASE/$RELEASE/$ARCH/$PKG/ ; ls)" ] ; then # directory exists but is empty: package is building… @@ -80,7 +79,8 @@ for PKG in $(find $RPMBASE/$RELEASE/$ARCH/* -maxdepth 1 -type d -exec basename { echo " $(LANG=C TZ=UTC ls --full-time $RPMBASE/$RELEASE/$ARCH/$PKG/build1.log | cut -d ' ' -f6 )" >> $HTML_BUFFER for LOG in build1.log build2.log ; do if [ -f $RPMBASE/$RELEASE/$ARCH/$PKG/$LOG ] ; then - echo " $LOG" >> $HTML_BUFFER + get_filesize $RPMBASE/$RELEASE/$ARCH/$PKG/$LOG + echo " $LOG ($SIZE)" >> $HTML_BUFFER else echo "  " >> $HTML_BUFFER fi -- cgit v1.2.3-54-g00ecf