X-Git-Url: https://git.decadent.org.uk/gitweb/?a=blobdiff_plain;f=daklib%2Fqueue.py;h=ccb806e939193f792cb4bce4495a1651386304ba;hb=22ab923e6120774d4a42e3c5cd26e7b8b23795d8;hp=9d1e386653930709661aef190d85885a726b6804;hpb=7e8f5758efb405feeffea18c6b4cad8d030841bb;p=dak.git diff --git a/daklib/queue.py b/daklib/queue.py index 9d1e3866..ccb806e9 100755 --- 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):