Merge commit 'ncomm/master' into merge

* commit 'ncomm/master':
  Added changelog and config file settings
  Clarified help message
  Added 822 reported to queue_report to writing out to a file

Signed-off-by: Joerg Jaspert <joerg@debian.org>

diff --git a/dak/queue_report.py b/dak/queue_report.py
index ecf52e16c67e10d43faf7205510aaf9fbfb94ec1..59f1b7f404f1ca4479acd0e43beb4c398d175523 100755 (executable)
--- a/dak/queue_report.py
+++ b/dak/queue_report.py
@@ -439,7 +439,7 @@ def process_changes_files(changes_files, type):
     # Will be enhanced in the future.
 
     if Cnf.has_key("Queue-Report::Options:822"):
-        # Open the report file 
+        # Open the report file
         f = open(Cnf["Queue-Report::ReportLocations::822Location"], "w")
 
         # print stuff out in 822 format
@@ -453,7 +453,7 @@ def process_changes_files(changes_files, type):
             f.write("Architectures:")
             f.write( (", ".join(arch_list.split(" "))) + "\n")
             f.write("Age: " + time_pp(last_modified) + "\n")
-            
+
             (name, mail) = maint.split(":")
             f.write("Maintainer: " + name + " <"+mail+">" + "\n")
             if changedby: