From: Joerg Jaspert <joerg@debian.org>
Date: Tue, 21 Aug 2012 21:03:00 +0000 (+0200)
Subject: Merge remote-tracking branch 'drkranz/fixes' into merge
X-Git-Url: https://git.decadent.org.uk/gitweb/?a=commitdiff_plain;h=e7a05948d115c258827ac6718f0d404c2782d80b;hp=84ced9b1e7feeda78b9b7ba3f843e53f2ffccec4;p=dak.git

Merge remote-tracking branch 'drkranz/fixes' into merge

* drkranz/fixes:
  Fix sorting of NEW packages to match new parameter names
  Fix note display in Prod and Manual reject mode
  Fix typos in rm template, thanks Noel David Torres Taño

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

diff --git a/dak/process_new.py b/dak/process_new.py
index 583143bb..afd03d23 100755
--- a/dak/process_new.py
+++ b/dak/process_new.py
@@ -534,7 +534,7 @@ def do_new(upload, upload_copy, handler, session):
             missing = edit_overrides (missing, upload, session)
         elif answer == 'M' and not Options["Trainee"]:
             reason = Options.get('Manual-Reject', '') + "\n"
-            reason = reason + "\n".join([n.comment for n in get_new_comments(upload.changes.source, session=session)])
+            reason = reason + "\n\n=====\n\n".join([n.comment for n in get_new_comments(upload.changes.source, session=session)])
             reason = get_reject_reason(reason)
             if reason is not None:
                 Logger.log(["NEW REJECT", upload.changes.changesname])
diff --git a/dak/queue_report.py b/dak/queue_report.py
index ad2a8531..0ab0b732 100755
--- a/dak/queue_report.py
+++ b/dak/queue_report.py
@@ -498,16 +498,16 @@ def process_queue(queue, log, rrd_dir):
         age =  Cnf["Queue-Report::Options::Age"]
     if Cnf.has_key("Queue-Report::Options::New"):
     # If we produce html we always have oldest first.
-        direction.append([5,-1,"ao"])
+        direction.append([6,-1,"ao"])
     else:
         if Cnf.has_key("Queue-Report::Options::Sort"):
             for i in Cnf["Queue-Report::Options::Sort"].split(","):
                 if i == "ao":
                     # Age, oldest first.
-                    direction.append([5,-1,age])
+                    direction.append([6,-1,age])
                 elif i == "an":
                     # Age, newest first.
-                    direction.append([5,1,age])
+                    direction.append([6,1,age])
                 elif i == "na":
                     # Name, Ascending.
                     direction.append([0,1,0])
@@ -516,10 +516,10 @@ def process_queue(queue, log, rrd_dir):
                     direction.append([0,-1,0])
                 elif i == "nl":
                     # Notes last.
-                    direction.append([4,1,0])
+                    direction.append([5,1,0])
                 elif i == "nf":
                     # Notes first.
-                    direction.append([4,-1,0])
+                    direction.append([5,-1,0])
     entries.sort(lambda x, y: sortfunc(x, y))
     # Yes, in theory you can add several sort options at the commandline with. But my mind is to small
     # at the moment to come up with a real good sorting function that considers all the sidesteps you
@@ -566,7 +566,7 @@ def process_queue(queue, log, rrd_dir):
     source_count = len(per_source_items)
 
     if Cnf.has_key("Queue-Report::Options::New"):
-        direction.append([5,1,"ao"])
+        direction.append([6,1,"ao"])
         entries.sort(lambda x, y: sortfunc(x, y))
     # Output for a html file. First table header. then table_footer.
     # Any line between them is then a <tr> printed from subroutine table_row.
diff --git a/daklib/queue.py b/daklib/queue.py
index e81614c3..547972ed 100644
--- a/daklib/queue.py
+++ b/daklib/queue.py
@@ -108,8 +108,7 @@ def prod_maintainer(notes, upload):
     # Here we prepare an editor and get them ready to prod...
     (fd, temp_filename) = utils.temp_filename()
     temp_file = os.fdopen(fd, 'w')
-    for note in notes:
-        temp_file.write(note.comment)
+    temp_file.write("\n\n=====\n\n".join([note.comment for note in notes]))
     temp_file.close()
     editor = os.environ.get("EDITOR","vi")
     answer = 'E'
diff --git a/templates/rm.bug-close-with-related b/templates/rm.bug-close-with-related
index 0cfabe7f..e097a756 100644
--- a/templates/rm.bug-close-with-related
+++ b/templates/rm.bug-close-with-related
@@ -26,9 +26,9 @@ from unstable when removing them from testing causes no dependency
 problems. The release team can force a removal from testing if it is
 really needed, please contact them if this should be the case.
 
-We try to close Bugs which have been reported against this package
-automatically.  But please check all old bugs, if they where closed
-correctly or should have been re-assign to another package.
+We try to close bugs which have been reported against this package
+automatically. But please check all old bugs, if they were closed
+correctly or should have been re-assigned to another package.
 
 Thank you for reporting the bug, which will now be closed.  If you
 have further comments please address them to __BUG_NUMBER__@__BUG_SERVER__.