Merge commit 'dak-master/master' into dm_upload_allowed

Conflicts:

	ChangeLog

Signed-off-by: Michael Casadevall <sonicmctails@gmail.com>

diff --git a/ChangeLog b/ChangeLog
index bb145f4b79e73337a682bc668d5a2a6b4423eab9..1f5e33c3dbfbe0fe0fadb7bab8d1c5d88c87068a 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -43,6 +43,8 @@
 
         * setup/init_pool.sql - Updated schema
 
+        * dak/queue_report.py - Added Last Modified in asctime() for QA team
+
 2008-12-23  Michael Casadevall <sonicmctails@gmail.com>
 
         * dak/queue_report.py - Added 822 output format

diff --git a/dak/queue_report.py b/dak/queue_report.py
index ce88d09ffc235acd4f9531dad344cf896bf7261e..31b11d8dd0c0957f0eafa22c4b5279c0c942d263 100755 (executable)
--- a/dak/queue_report.py
+++ b/dak/queue_report.py
@@ -450,6 +450,7 @@ def process_changes_files(changes_files, type, log):
             log.write("Architectures: ")
             log.write( (", ".join(arch_list.split(" "))) + "\n")
             log.write("Age: " + time_pp(last_modified) + "\n")
+            log.write("Last-Modified: " + str(int(time.time()) - int(last_modified)) + "\n")
             log.write("Queue: " + type + "\n")
 
             (name, mail) = maint.split(":")