From 81769e9553930756241ccc6f360bff089eb1d169 Mon Sep 17 00:00:00 2001 From: Erich Eckner Date: Wed, 2 Aug 2017 11:34:47 +0200 Subject: new config variable "webserver_directory" replaces "graphs_directory" --- bin/show-dependencies | 8 ++++---- conf/default.conf | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/bin/show-dependencies b/bin/show-dependencies index 6c1d80f..fd7bf97 100755 --- a/bin/show-dependencies +++ b/bin/show-dependencies @@ -17,12 +17,12 @@ if [ $# -eq 0 ]; then "$0" ${broken} || \ exit $? ( - ls "${graphs_directory}" + ls "${webserver_directory}/graphs" printf '%s.png\n' ${broken} ${broken} ) | \ sort | \ uniq -u | \ - sed "s|^|${graphs_directory}/|" | \ + sed "s|^|${webserver_directory}/graphs/|" | \ xargs -r rm exit fi @@ -85,7 +85,7 @@ ls "${work_dir}/package-infos" | \ for target_package in "$@"; do - output="${graphs_directory}/${target_package}.png" + output="${webserver_directory}/graphs/${target_package}.png" grep " $(str_to_regex "${target_package}")\$" "${tmp_dir}/original-build-order" | \ sort -u > \ @@ -227,7 +227,7 @@ for target_package in "$@"; do if [ "${line_count}" -gt 500 ]; then sed -i '/"base\(-devel\)\?"/d' "${tmp_dir}/input" line_count="$(wc -l < "${tmp_dir}/input")" - if [ "${line_count}" -gt 600 ]; then + if [ "${line_count}" -gt 700 ]; then rm -f "${output}" >&2 printf 'Skipping graph for "%s" - would be too big (%d).\n' \ "${target_package}" \ diff --git a/conf/default.conf b/conf/default.conf index 6e74bc6..730481d 100755 --- a/conf/default.conf +++ b/conf/default.conf @@ -51,8 +51,8 @@ straws_that_might_repair_failing_builds="$( ':with_build_support:clean_chroot:' )" -# where should dependency graphs be stored -graphs_directory='/srv/http/graphs' +# root directory of the webserver +webserver_directory='/srv/http' # possibly pull in custom modifications -- cgit v1.2.3-54-g00ecf