| 1 |
commit: ed8c6968a49e85d8da58425eb1eb946f01ab48e1 |
| 2 |
Author: Michał Górny <mgorny <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Tue Jun 2 16:14:42 2020 +0000 |
| 4 |
Commit: Michał Górny <mgorny <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Tue Jun 2 16:14:42 2020 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/proj/qa-scripts.git/commit/?id=ed8c6968 |
| 7 |
|
| 8 |
Support package filtering & rev info in pkgcheck2html |
| 9 |
|
| 10 |
Signed-off-by: Michał Górny <mgorny <AT> gentoo.org> |
| 11 |
|
| 12 |
cgi-bin/get-git-file.sh | 8 +++++++- |
| 13 |
pkgcheck2html | 2 +- |
| 14 |
2 files changed, 8 insertions(+), 2 deletions(-) |
| 15 |
|
| 16 |
diff --git a/cgi-bin/get-git-file.sh b/cgi-bin/get-git-file.sh |
| 17 |
index e899601..ef57a72 100755 |
| 18 |
--- a/cgi-bin/get-git-file.sh |
| 19 |
+++ b/cgi-bin/get-git-file.sh |
| 20 |
@@ -24,6 +24,9 @@ main() { |
| 21 |
include-projects) |
| 22 |
projects=--projects |
| 23 |
;; |
| 24 |
+ pkg=*) |
| 25 |
+ filter_pkg="--pkg ${pkg}" |
| 26 |
+ ;; |
| 27 |
esac |
| 28 |
[[ ${qs} == *\;* ]] && qs=${qs#*;} || qs= |
| 29 |
done |
| 30 |
@@ -64,6 +67,9 @@ main() { |
| 31 |
fi |
| 32 |
fi |
| 33 |
|
| 34 |
+ local revarg= |
| 35 |
+ [[ ${commit} != HEAD ]] && revarg="--revision ${commit}" |
| 36 |
+ |
| 37 |
local ct |
| 38 |
case "${file}" in |
| 39 |
*.css) ct=text/css;; |
| 40 |
@@ -81,7 +87,7 @@ main() { |
| 41 |
| PYTHONIOENCODING=utf8 python \ |
| 42 |
"${topdir}"/pkgcheck2html/pkgcheck2html.py ${verbose} \ |
| 43 |
-x "${topdir}"/pkgcheck2html/excludes.json \ |
| 44 |
- ${filter_maint} ${projects} -t "${ts}" - |
| 45 |
+ ${filter_maint} ${projects} ${filter_pkg} -t "${ts}" - |
| 46 |
else |
| 47 |
git cat-file -p "${tree[2]}" |
| 48 |
fi |
| 49 |
|
| 50 |
diff --git a/pkgcheck2html b/pkgcheck2html |
| 51 |
index a0d7dc5..4eb6fc5 160000 |
| 52 |
--- a/pkgcheck2html |
| 53 |
+++ b/pkgcheck2html |
| 54 |
@@ -1 +1 @@ |
| 55 |
-Subproject commit a0d7dc5e8b7d6f2c3aef16020513440851cf8b9c |
| 56 |
+Subproject commit 4eb6fc540e0d94badb23874be411ad2df894b08f |
Archives