mirror of
				https://git.launchpad.net/~ubuntu-release/britney/+git/britney2-ubuntu
				synced 2025-11-04 10:34:05 +00:00 
			
		
		
		
	Update email address used for emails
@canonical.com is now DKIM signed and SPF published which means emails from proposed-migration running on snakefruit sending direct would likely be caught out. Since we're here, the project is Ubuntu related so switch to using an @ubuntu.com address instead.
This commit is contained in:
		
							parent
							
								
									53aaf8f8e9
								
							
						
					
					
						commit
						fd20237673
					
				@ -28,7 +28,7 @@ BOTS = {
 | 
			
		||||
    USER + "katie",
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
MESSAGE = """From: Ubuntu Release Team <noreply@canonical.com>
 | 
			
		||||
MESSAGE = """From: Ubuntu Release Team <noreply+proposed-migration@ubuntu.com>
 | 
			
		||||
To: {recipients}
 | 
			
		||||
X-Proposed-Migration: notice
 | 
			
		||||
Subject: [proposed-migration] {source_name} {version} stuck in {series}-proposed for {age} day{plural}.
 | 
			
		||||
@ -287,7 +287,7 @@ class EmailPolicy(BasePolicy, Rest):
 | 
			
		||||
                        )
 | 
			
		||||
                    )
 | 
			
		||||
                    server = smtplib.SMTP(self.email_host)
 | 
			
		||||
                    server.sendmail("noreply@canonical.com", emails, msg)
 | 
			
		||||
                    server.sendmail("noreply+proposed-migration@ubuntu.com", emails, msg)
 | 
			
		||||
                    server.quit()
 | 
			
		||||
                    # record the age at which the mail should have been sent
 | 
			
		||||
                    last_sent = last_due
 | 
			
		||||
 | 
			
		||||
@ -171,7 +171,7 @@ class SRUADTRegressionPolicy(BasePolicy, Rest):
 | 
			
		||||
                    bug_mail = "%s@bugs.launchpad.net" % bug
 | 
			
		||||
                    server = smtplib.SMTP(self.email_host)
 | 
			
		||||
                    server.sendmail(
 | 
			
		||||
                        "noreply@canonical.com",
 | 
			
		||||
                        "noreply+proposed-migration@ubuntu.com",
 | 
			
		||||
                        bug_mail,
 | 
			
		||||
                        MESSAGE.format(**locals()),
 | 
			
		||||
                    )
 | 
			
		||||
 | 
			
		||||
		Loading…
	
	
			
			x
			
			
		
	
		Reference in New Issue
	
	Block a user