summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorHolger Levsen <holger@layer-acht.org>2014-10-23 14:14:43 +0200
committerHolger Levsen <holger@layer-acht.org>2014-10-23 14:14:43 +0200
commit93e88ec4f96a70092bf01757be1ce78c36f52d91 (patch)
treec08788c3ab9e6b3fd7230554c1f58ffa6c8c2af2
parentf6056bd3142a622188718b11e147dbed76bf7e74 (diff)
downloadjenkins.debian.net-93e88ec4f96a70092bf01757be1ce78c36f52d91.tar.xz
reproducible: refactor, fix subtile bug with packages not being detected as noted.
-rwxr-xr-xbin/reproducible_html_notes.sh13
1 files changed, 9 insertions, 4 deletions
diff --git a/bin/reproducible_html_notes.sh b/bin/reproducible_html_notes.sh
index 33bcacf4..97b7796b 100755
--- a/bin/reproducible_html_notes.sh
+++ b/bin/reproducible_html_notes.sh
@@ -224,10 +224,12 @@ parse_issues() {
write_notes() {
touch $NOTES_PATH/stamp
+ # actually write notes
for PKG in $PACKAGES_WITH_NOTES ; do
PAGE=$NOTES_PATH/${PKG}_note.html
create_pkg_note $PKG
done
+ # cleanup old notes and re-create package page if needed
cd $NOTES_PATH
for FILE in *.html ; do
PKG_FILE=/var/lib/jenkins/userContent/rb-pkg/${FILE:0:-10}.html
@@ -237,9 +239,13 @@ write_notes() {
rm $FILE
# force re-creation of package file if there was a note
rm -f ${PKG_FILE}
+ process_packages ${FILE:0-10}
else
- # ... else re-recreate ${PKG_FILE} if it does not contain a link to the note
- grep _note.html ${PKG_FILE} > /dev/null 2>&1 || rm -f ${PKG_FILE}
+ # ... else re-recreate ${PKG_FILE} if it does not contain a link to the note already
+ if ! grep _note.html ${PKG_FILE} > /dev/null 2>&1 ; then
+ rm -f ${PKG_FILE}
+ process_packages ${FILE:0-10}
+ fi
fi
done
rm stamp
@@ -296,9 +302,8 @@ if $VALID_YAML ; then
parse_notes
echo "$(date) - processing packages with notes"
force_package_targets ${PACKAGES_WITH_NOTES}
- write_issues
write_notes
- process_packages ${PACKAGES_WITH_NOTES}
+ write_issues
else
echo "Warning: ${ISSUES_YML} or ${PACKAGES_YML} contains invalid yaml, please fix."
fi