[SCM] Debian package checker branch, master, updated. 2.5.11-29-gce7bbee
The following commit has been merged in the master branch:
commit 459a98d659fe160ed8d9ea47b5ab320a5dece85a
Author: Jordà Polo <jorda@ettin.org>
Date: Thu Dec 27 13:58:27 2012 +0100
Use global $GRAPHS_RANGE_DAYS
* reporting/html_reports:
+ [JP] Use global $GRAPHS_RANGE_DAYS.
diff --git a/debian/changelog b/debian/changelog
index 215d233..47da92c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -51,6 +51,7 @@ lintian (2.5.12) UNRELEASED; urgency=low
Thanks to Joerg "Gannef" Jasper for the suggestion to use
RewriteMap. (Closes: #696960)
+ [JP] Fix version labels glitches.
+ + [JP] Use global $GRAPHS_RANGE_DAYS.
* reporting/templates/{packages,maintainer,tag}.tmpl:
+ [NT] Properly handle multiple versions of the same source and
add versioned anchors to them.
diff --git a/reporting/config b/reporting/config
index 1ab5179..9cc192b 100644
--- a/reporting/config
+++ b/reporting/config
@@ -28,7 +28,7 @@ $HISTORY_DIR = "$HOME/history";
# Requires that $HISTORY is enabled.
$GRAPHS = 1;
# Make graphs of the data in the time interval
-# [today() - $GRAPH_RANGE_DAYS ; now()]
+# [today() - $GRAPHS_RANGE_DAYS ; now()]
$GRAPHS_RANGE_DAYS = 240;
$log_file = "$LOG_DIR/harness.log";
diff --git a/reporting/html_reports b/reporting/html_reports
index 9be1bf5..3e78c54 100755
--- a/reporting/html_reports
+++ b/reporting/html_reports
@@ -37,7 +37,7 @@ use Text::Template ();
our ($LINTIAN_ROOT, $LINTIAN_LAB, $LINTIAN_ARCHIVEDIR, $LINTIAN_DIST,
$LINTIAN_ARCH, $HTML_TMP_DIR, $statistics_file,
$LINTIAN_AREA, $HISTORY, $HISTORY_DIR, $LINTIAN_SOURCE,
- $GRAPH_RANGE_DAYS, $GRAPHS, $GRAPH_DIR, $LINTIAN_MIRROR_NAME);
+ $GRAPHS_RANGE_DAYS, $GRAPHS, $GRAPH_DIR, $LINTIAN_MIRROR_NAME);
# Read the configuration.
require './config';
@@ -615,9 +615,8 @@ if ($GRAPHS) {
or die "cannot create output directory $GRAPH_DIR: $!\n";
mkdir("$GRAPH_DIR/tags", 0777)
or die "cannot create output directory $GRAPH_DIR/tags: $!\n";
- my $RANGE_DAYS = 240;
- my $date_min = strftime ("%s", localtime ($unix_time - 3600 * 24 * $RANGE_DAYS));
+ my $date_min = strftime ("%s", localtime ($unix_time - 3600 * 24 * $GRAPHS_RANGE_DAYS));
my $date_max = strftime ("%s", localtime ($unix_time));
# Generate loadable Gnuplot file with common variables and labels/arrows
@@ -637,7 +636,7 @@ if ($GRAPHS) {
# Skip label if previous release is too close; graphs can't display
# more than ~32 labels.
- my $min_spacing = 3600 * 24 * $RANGE_DAYS / 32;
+ my $min_spacing = 3600 * 24 * $GRAPHS_RANGE_DAYS / 32;
if ($versions{$v} - $last_version > $min_spacing) {
(my $label = $v) =~ s/\-[\w\d]+$//;
print { $common } "set label '$label' at '$versions{$v}',graph ",
--
Debian package checker
Reply to: