[Git][ftp-team/dak][master] 2 commits: Restore tracking server in a few places

[Joerg Jaspert <joerg@debian.org>]

Title: GitLab

Joerg Jaspert pushed to branch master at Debian FTP Team / dak

Commits:

• 64003274
  by Luca Falavigna at 2018-05-19T16:09:40+00:00

  Restore tracking server in a few places
  

• 49085812
  by Joerg Jaspert at 2018-05-19T16:14:25+00:00

  Merge branch 'tracking' into 'master'
  
  Restore tracking server in a few places
  
  See merge request ftp-team/dak!41

2 changed files:

• daklib/announce.py
• daklib/queue.py

Changes:

daklib/announce.py

---

...	...	@@ -132,7 +132,7 @@ def announce_accept(upload):
132	132	send_mail(message, whitelists=whitelists)
133	133
134	134	if accepted_to_real_suite and upload.sourceful:
135		- # senf mail to announce lists and packages server
	135	+ # send mail to announce lists and tracking server
136	136	announce = set()
137	137	for suite in upload.suites:
138	138	if suite.policy_queue is None or suite in upload.from_policy_suites:

daklib/queue.py

---

...	...	@@ -252,8 +252,8 @@ class Upload(object):
252	252	self.Subst["__MAINTAINER_TO__"] += ", %s" % self.pkg.changes["sponsoremail"]
253	253	session.close()
254	254
255		- if "Dinstall::PackagesServer" in cnf and "source" in self.pkg.changes:
256		- self.Subst["__MAINTAINER_TO__"] += "\nBcc: %s@%s" % (self.pkg.changes["source"], cnf["Dinstall::PackagesServer"])
	255	+ if "Dinstall::TrackingServer" in cnf and "source" in self.pkg.changes:
	256	+ self.Subst["__MAINTAINER_TO__"] += "\nBcc: dispatch@%s" % (cnf["Dinstall::TrackingServer"])
257	257
258	258	# Apply any global override of the Maintainer field
259	259	if cnf.get("Dinstall::OverrideMaintainer"):
...	...	@@ -343,9 +343,9 @@ class Upload(object):
343	343	if action:
344	344	self.update_subst()
345	345	self.Subst["__ANNOUNCE_LIST_ADDRESS__"] = announce_list
346		- if cnf.get("Dinstall::PackagesServer") and \
	346	+ if cnf.get("Dinstall::TrackingServer") and \
347	347	"source" in self.pkg.changes["architecture"]:
348		- trackingsendto = "Bcc: %s@%s" % (self.pkg.changes["source"], cnf["Dinstall::PackagesServer"])
	348	+ trackingsendto = "Bcc: dispatch@%s" % (cnf["Dinstall::TrackingServer"])
349	349	self.Subst["__ANNOUNCE_LIST_ADDRESS__"] += "\n" + trackingsendto
350	350
351	351	mail_message = utils.TemplateSubst(self.Subst, announcetemplate)

—
View it on GitLab.
You're receiving this email because of your account on salsa.debian.org. If you'd like to receive fewer emails, you can adjust your notification settings.