summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rwxr-xr-xbin/reproducible_html_repo_stats.sh18
-rw-r--r--logparse/reproducible.rules1
2 files changed, 8 insertions, 11 deletions
diff --git a/bin/reproducible_html_repo_stats.sh b/bin/reproducible_html_repo_stats.sh
index de867692..a4c654b3 100755
--- a/bin/reproducible_html_repo_stats.sh
+++ b/bin/reproducible_html_repo_stats.sh
@@ -43,7 +43,7 @@ for PKG in $SOURCES ; do
BET=${VERSION}
fi
done
- SID=$(rmadison -s sid $PKG | cut -d "|" -f2|xargs echo|sed 's# #<br />#g')
+ SID=$(rmadison -s sid $PKG | cut -d "|" -f2|xargs echo)
for VERSION in ${VERSIONS} ; do
if [ "${VERSION}" != "$BET" ] ; then
WARN=true
@@ -51,18 +51,18 @@ for PKG in $SOURCES ; do
fi
done
#
- # colorize output
+ # format output
#
CSID=""
for i in $SID ; do
if dpkg --compare-versions "$i" gt "$BET" ; then
- CSID="$CSID <span class=\"orange\">$i</span>"
+ CSID="$CSID<span class=\"orange\">$i</span><br />"
BET=""
if [ ! -z "$BET" ] ; then
CRUFT="$BET $CRUFT"
fi
else
- CSID="$CSID $I"
+ CSID="$CSID$i<br />"
fi
done
if [ ! -z "$BET" ] ; then
@@ -70,17 +70,15 @@ for PKG in $SOURCES ; do
else
BET="&nbsp;"
fi
+ if [ ! -z "$CRUFT" ] ; then
+ CRUFT="$(echo $CRUFT|sed 's# #<br />#g')"
+ fi
#
# write output
#
write_page "<td>$BET</td>"
write_page "<td>$CSID</td>"
- if $WARN ; then
- echo "Warning: more than one version of $PKG available in our repo, please clean up."
- write_page "<td>$(echo $CRUFT|sed 's# #<br />#g')</td>"
- else
- write_page "<td>&nbsp;</td>"
- fi
+ write_page "<td>$CRUFT</td>"
write_page "</tr>"
done
write_page "</table></p>"
diff --git a/logparse/reproducible.rules b/logparse/reproducible.rules
index e4cf581e..3c743246 100644
--- a/logparse/reproducible.rules
+++ b/logparse/reproducible.rules
@@ -10,4 +10,3 @@ warning /Warning: processes found which should not be there/
warning /Warning: packages found where the build was started more than 24h ago:/
warning /Warning: .+ could not be fully removed./
warning /Warning: could not download.+/
-warning /Warning: more than one version of .+ available in our repo, please clean up./