[gentoo-commits] proj/qa-scripts:master commit in: /, cgi-bin/

[gentoo-commits] proj/qa-scripts:master commit in: /, cgi-bin/

[Michał Górny]

commit:     5830d893c38d77b8d27c132f07a4ce985eb9f994
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Wed Jul 17 12:57:57 2019 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Wed Jul 17 12:57:57 2019 +0000
URL:        https://gitweb.gentoo.org/proj/qa-scripts.git/commit/?id=5830d893

Support quiet/verbose output in pkgcheck2html

Signed-off-by: Michał Górny <mgorny <AT> gentoo.org>

 cgi-bin/get-git-file.sh | 7 ++++++-
 pkgcheck2html           | 2 +-
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/cgi-bin/get-git-file.sh b/cgi-bin/get-git-file.sh
index 5e9fd0d..09f2575 100755
--- a/cgi-bin/get-git-file.sh
+++ b/cgi-bin/get-git-file.sh
@@ -28,7 +28,12 @@ main() {
 	fi
 
 	# generate HTML from XML
+	local verbose=
 	local lfile=${file}
+	if [[ ${file} == *.verbose.html ]]; then
+		file=${file%.verbose.html}.html
+		verbose=--verbose
+	fi
 	[[ ${file} == *.html ]] && lfile=${file%.html}.xml
 
 	local tree=( $(git ls-tree "${commit}" "${lfile}" 2>/dev/null) )
@@ -58,7 +63,7 @@ main() {
 		local ts=$(TZ=UTC git log --format='%cd' --date=iso-local -1 | cut -d' ' -f1-2)
 
 		git cat-file -p "${tree[2]}" \
-			| PYTHONIOENCODING=utf8 python "${topdir}"/pkgcheck2html/pkgcheck2html.py -t "${ts}" -
+			| PYTHONIOENCODING=utf8 python "${topdir}"/pkgcheck2html/pkgcheck2html.py ${verbose} -t "${ts}" -
 	else
 		git cat-file -p "${tree[2]}"
 	fi

diff --git a/pkgcheck2html b/pkgcheck2html
index 5a94a88..a0d6845 160000
--- a/pkgcheck2html
+++ b/pkgcheck2html
@@ -1 +1 @@
-Subproject commit 5a94a886cda0f466a4dc1130e8ff31069ee13b43
+Subproject commit a0d68457dc19589031f1d57303ad629b3ecb9dc1

[gentoo-commits] proj/qa-scripts:master commit in: /, cgi-bin/

[Michał Górny]

commit:     0591d281c3174a0a9cc831782b0a0c8be4d15117
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Sat Nov  2 09:49:10 2019 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Sat Nov  2 09:49:10 2019 +0000
URL:        https://gitweb.gentoo.org/proj/qa-scripts.git/commit/?id=0591d281

Bump pkgcheck2html to enable excludes support

Signed-off-by: Michał Górny <mgorny <AT> gentoo.org>

 cgi-bin/get-git-file.sh | 1 +
 pkgcheck2html           | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/cgi-bin/get-git-file.sh b/cgi-bin/get-git-file.sh
index 5b7b8fc..e899601 100755
--- a/cgi-bin/get-git-file.sh
+++ b/cgi-bin/get-git-file.sh
@@ -80,6 +80,7 @@ main() {
 		git cat-file -p "${tree[2]}" \
 			| PYTHONIOENCODING=utf8 python \
 			"${topdir}"/pkgcheck2html/pkgcheck2html.py ${verbose} \
+			-x "${topdir}"/pkgcheck2html/excludes.json \
 			${filter_maint} ${projects} -t "${ts}" -
 	else
 		git cat-file -p "${tree[2]}"

diff --git a/pkgcheck2html b/pkgcheck2html
index 887c28e..bb6570d 160000
--- a/pkgcheck2html
+++ b/pkgcheck2html
@@ -1 +1 @@
-Subproject commit 887c28e758025d8c452962a4c7d40a73b8c65ce7
+Subproject commit bb6570da9749e349fca302e28d58df3ad9975562