summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorHolger Levsen <holger@layer-acht.org>2017-01-11 22:41:57 +0100
committerHolger Levsen <holger@layer-acht.org>2017-01-11 22:41:57 +0100
commitbb3c1b63b15f67d326d199391e32ffbeeee6b669 (patch)
treeda5cf1db84af1531f455d3d1fbea8f331a6d2b88
parentee84610406e2f3d261acc4b7d90a61fba00cc7b3 (diff)
downloadjenkins.debian.net-bb3c1b63b15f67d326d199391e32ffbeeee6b669.tar.xz
reproducible Debian: s#html page#HTML page#g
Signed-off-by: Holger Levsen <holger@layer-acht.org>
-rw-r--r--README2
-rwxr-xr-xbin/reproducible_common.sh4
-rwxr-xr-xbin/reproducible_html_breakages.py2
-rwxr-xr-xbin/reproducible_html_notes.py2
-rwxr-xr-xbin/reproducible_html_packages.py2
-rwxr-xr-xbin/reproducible_remote_scheduler.py2
-rw-r--r--logparse/reproducible.rules2
7 files changed, 8 insertions, 8 deletions
diff --git a/README b/README
index ac1f01ea..17b846b7 100644
--- a/README
+++ b/README
@@ -156,7 +156,7 @@ Installation tests inside chroot environments.
** old versions, already tested (at least two weeks ago)
** and also some old versions which failed to build (at least ten days ago), if no bug has been filed.
-* Several other jobs exist to build the html pages and to create two JSON files which can be downloaded from https://tests.reproducible-builds.org/reproducible.json and https://tests.reproducible-builds.org/reproducible-tracker.json. The 1st one has all the data (except history) and the 2nd has all the data we consider relevant to bother maintainers with, that is, some ftbfs isses are excluded.
+* Several other jobs exist to build the HTML pages and to create two JSON files which can be downloaded from https://tests.reproducible-builds.org/reproducible.json and https://tests.reproducible-builds.org/reproducible-tracker.json. The 1st one has all the data (except history) and the 2nd has all the data we consider relevant to bother maintainers with, that is, some ftbfs isses are excluded.
* Information from https://anonscm.debian.org/git/reproducible/notes.git is incorporated on pushes to that git repo.
diff --git a/bin/reproducible_common.sh b/bin/reproducible_common.sh
index 1ce8aec6..b5478d25 100755
--- a/bin/reproducible_common.sh
+++ b/bin/reproducible_common.sh
@@ -157,7 +157,7 @@ write_icon() {
write_page_header() {
# this is really quite uncomprehensible and should be killed
- # the solution is to write all html pages with python…
+ # the solution is to write all HTML pages with python…
rm -f $PAGE
MAINVIEW="dashboard"
write_page "<!DOCTYPE html><html><head>"
@@ -513,7 +513,7 @@ gen_package_html() {
cd /srv/jenkins/bin
python3 -c "import reproducible_html_packages as rep
pkg = rep.Package('$1', no_notes=True)
-rep.gen_packages_html([pkg], no_clean=True)" || echo "Warning: cannot update html pages for $1"
+rep.gen_packages_html([pkg], no_clean=True)" || echo "Warning: cannot update HTML pages for $1"
cd - > /dev/null
}
diff --git a/bin/reproducible_html_breakages.py b/bin/reproducible_html_breakages.py
index 0655923b..7ca883ae 100755
--- a/bin/reproducible_html_breakages.py
+++ b/bin/reproducible_html_breakages.py
@@ -39,7 +39,7 @@ def unrep_with_dbd_issues():
bad_dbd.append((pkg, version, suite, arch))
log.warning(suite + '/' + arch + '/' + pkg + ' (' + version + ') has '
'diffoscope output, but it does not seem to '
- 'be an html page.')
+ 'be an HTML page.')
if pkg not in sources_without_dbd:
sources_without_dbd.append(pkg)
return without_dbd, bad_dbd, sources_without_dbd
diff --git a/bin/reproducible_html_notes.py b/bin/reproducible_html_notes.py
index 953e5a8a..01b73abf 100755
--- a/bin/reproducible_html_notes.py
+++ b/bin/reproducible_html_notes.py
@@ -8,7 +8,7 @@
#
# Depends: python3 python3-yaml
#
-# Build html pages based on the content of the notes.git repository
+# Build HTML pages based on the content of the notes.git repository
import copy
import yaml
diff --git a/bin/reproducible_html_packages.py b/bin/reproducible_html_packages.py
index d5047848..832bb2df 100755
--- a/bin/reproducible_html_packages.py
+++ b/bin/reproducible_html_packages.py
@@ -322,7 +322,7 @@ def gen_history_page(package, arch=None):
def gen_packages_html(packages, no_clean=False):
"""
- generate the /rb-pkg/package.html pages.
+ generate the /rb-pkg/package.HTML pages.
packages should be a list of Package objects.
"""
total = len(packages)
diff --git a/bin/reproducible_remote_scheduler.py b/bin/reproducible_remote_scheduler.py
index 47c345c4..cd1eaad6 100755
--- a/bin/reproducible_remote_scheduler.py
+++ b/bin/reproducible_remote_scheduler.py
@@ -298,4 +298,4 @@ if not (local and requester == "jenkins maintenance job") and len(ids) != 0:
if not dry_run:
irc_msg(message)
-generate_schedule(arch) # update the html page
+generate_schedule(arch) # update the HTML page
diff --git a/logparse/reproducible.rules b/logparse/reproducible.rules
index d7f231ec..94beb217 100644
--- a/logparse/reproducible.rules
+++ b/logparse/reproducible.rules
@@ -10,7 +10,7 @@ warning /Warning: processes found which should not be there/
warning /Warning: found reproducible_build.sh processes which have pid 1 as parent.+/
warning /Warning: Found files with bad permissions.+/
warning /Warning: .+ could not be fully removed.+/
-warning /Warning: cannot update html pages for.+/
+warning /Warning: cannot update HTML pages for.+/
warning /Warning: too much difference for .+, aborting. Please investigate and update manually./
warning /Warning: something went wrong while parsing the build manifest as YAML file.+/
warning /Warning: dose-deb-coinstall cannot calculate the installable set for.+/