X-Git-Url: https://git.decadent.org.uk/gitweb/?a=blobdiff_plain;f=daklib%2Fqueue.py;h=d70e60b190d35195434ca031e50435f10c8c0ff7;hb=32dc9d52c53207a6524ecf63ac7866435ae40374;hp=03bc7e05d17f4ecf05b1ad8fb3448bd41240ff05;hpb=9b3cf7b8bdd96df4e9d34c661fc78f4f552a2dd6;p=dak.git diff --git a/daklib/queue.py b/daklib/queue.py index 03bc7e05..d70e60b1 100755 --- a/daklib/queue.py +++ b/daklib/queue.py @@ -353,7 +353,7 @@ class Upload(object): ########################################################################### def load_changes(self, filename): """ - @rtype boolean + @rtype: boolean @rvalue: whether the changes file was valid or not. We may want to reject even if this is True (see what gets put in self.rejects). This is simply to prevent us even trying things later which will @@ -1843,7 +1843,7 @@ distribution.""" user_email_address = utils.whoami() + " <%s>" % (cnf["Dinstall::MyAdminAddress"]) self.Subst["__REJECTOR_ADDRESS__"] = user_email_address self.Subst["__MANUAL_REJECT_MESSAGE__"] = reject_message - self.Subst["__CC__"] = "Cc: " + Cnf["Dinstall::MyEmailAddress"] + self.Subst["__CC__"] = "Cc: " + cnf["Dinstall::MyEmailAddress"] reject_mail_message = utils.TemplateSubst(self.Subst, rej_template) # Write the rejection email out as the .reason file os.write(reason_fd, reject_mail_message)