[Date Prev][Date Next] [Thread Prev][Thread Next] [Date Index] [Thread Index]

[SCM] Debian package checker branch, master, updated. 2.5.10-231-g836adb3



The following commit has been merged in the master branch:
commit 836adb3bdd39c5f126d41b887737d598164f19ef
Author: Niels Thykier <niels@thykier.net>
Date:   Thu Oct 25 17:35:56 2012 +0200

    reporting/html_reports: Make the mirror name configurable
    
    Make the mirror name configurable so the lintian.ubuntuwire.com setup
    does not have to patch html_reports.
    
    Signed-off-by: Niels Thykier <niels@thykier.net>

diff --git a/debian/changelog b/debian/changelog
index b009f98..38c34d1 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -217,6 +217,7 @@ lintian (2.5.11) UNRELEASED; urgency=low
   * reporting/html_reports:
     + [JP,NT] Generate graphs of the collected history data.
       (Closes: #672273)
+    + [NT] Make the mirror name configurable.
 
   * vendors/ubuntu/main/data/changes-file/known-dists:
     + [NT] Add "raring" as known Ubuntu distribution.  Thanks to
diff --git a/reporting/config b/reporting/config
index d6abf5c..1ab5179 100644
--- a/reporting/config
+++ b/reporting/config
@@ -3,6 +3,7 @@
 
 $HOME = "/org/lintian.debian.org";
 $LINTIAN_ARCHIVEDIR = "/org/ftp.debian.org/ftp";
+$LINTIAN_MIRROR_NAME = "ftp-master.debian.org";
 $LINTIAN_DIST = "sid";
 $LINTIAN_AREA = "main";
 $LINTIAN_ARCH = "i386";
diff --git a/reporting/html_reports b/reporting/html_reports
index 76adb3b..02c1b40 100755
--- a/reporting/html_reports
+++ b/reporting/html_reports
@@ -37,14 +37,14 @@ 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);
+     $GRAPH_RANGE_DAYS, $GRAPHS, $GRAPH_DIR, $LINTIAN_MIRROR_NAME);
 
 # Read the configuration.
 require './config';
 
 # The path to the mirror timestamp.
 our $LINTIAN_TIMESTAMP
-    = "$LINTIAN_ARCHIVEDIR/project/trace/ftp-master.debian.org";
+    = "$LINTIAN_ARCHIVEDIR/project/trace/$LINTIAN_MIRROR_NAME";
 
 # FIXME: At least the lab should be a parameter to Read_pkglists rather
 # than an environment variable.

-- 
Debian package checker


Reply to: