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

* drkranz/misc:
  Fix variable name in parse_checksum function (Closes: #658525)
  Display changes in ACCEPTED mails (Closes: #261096)
  When rejecting packages, make .changes files world readable (Closes: #156876)

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

diff --git a/daklib/queue.py b/daklib/queue.py
index 9d1e386653930709661aef190d85885a726b6804..ccb806e939193f792cb4bce4495a1651386304ba 100755 (executable)
--- a/daklib/queue.py
+++ b/daklib/queue.py
@@ -1933,8 +1933,7 @@ transition is done."""
         # This is for direport's benefit...
         f = re_fdnic.sub("\n .\n", self.pkg.changes.get("changes", ""))
 
-        if byhand or new:
-            summary += "Changes: " + f
+        summary += "\n\nChanges:\n" + f
 
         summary += "\n\nOverride entries for your package:\n" + override_summary + "\n"
 
@@ -2425,11 +2424,15 @@ distribution."""
 
         reason_filename = self.pkg.changes_file[:-8] + ".reason"
         reason_filename = os.path.join(cnf["Dir::Reject"], reason_filename)
+        changesfile = os.path.join(cnf["Dir::Reject"], self.pkg.changes_file)
 
         # Move all the files into the reject directory
         reject_files = self.pkg.files.keys() + [self.pkg.changes_file]
         self.force_reject(reject_files)
 
+        # Change permissions of the .changes file to be world readable
+        os.chmod(changesfile, os.stat(changesfile).st_mode | stat.S_IROTH)
+
         # If we fail here someone is probably trying to exploit the race
         # so let's just raise an exception ...
         if os.path.exists(reason_filename):

diff --git a/daklib/utils.py b/daklib/utils.py
index 5e702b04d51a182cd3ee5f82ff8c2d1b5edf4cb0..9afd420e8d154f4824440c7c304812dadc0a68fa 100755 (executable)
--- a/daklib/utils.py
+++ b/daklib/utils.py
@@ -526,8 +526,7 @@ def parse_checksums(where, files, manifest, hashname):
         files[checkfile][hash_key(hashname)] = checksum
     for f in files.keys():
         if not files[f].has_key(hash_key(hashname)):
-            rejmsg.append("%s: no entry in checksums-%s in %s" % (checkfile,
-                hashname, where))
+            rejmsg.append("%s: no entry in checksums-%s in %s" % (f, hashname, where))
     return rejmsg
 
 ################################################################################