ftpmaster-dak r1088: Merge mailtags
------------------------------------------------------------
revno: 1088
committer: Joerg Jaspert <joerg@debian.org>
branch nick: upstream
timestamp: Thu 2008-05-08 00:44:09 +0200
message:
Merge mailtags
modified:
ChangeLog
dak/override.py
dak/rm.py
templates/override.bug-close
templates/process-accepted.install
templates/process-accepted.unaccept
templates/process-new.bxa_notification
templates/process-new.prod
templates/process-unchecked.accepted
templates/process-unchecked.announce
templates/process-unchecked.bug-close
templates/process-unchecked.bug-experimental-fixed
templates/process-unchecked.bug-nmu-fixed
templates/process-unchecked.new
templates/process-unchecked.override-disparity
templates/queue.rejected
templates/reject-proposed-updates.rejected
templates/rm.bug-close
tools/debianqueued-0.9/ChangeLog
tools/debianqueued-0.9/debianqueued
------------------------------------------------------------
revno: 1087.1.1
committer: Joerg Jaspert <joerg@debian.org>
branch nick: mailtags
timestamp: Thu 2008-05-08 00:43:45 +0200
message:
Add X-Debian: DAK headers to mails
modified:
ChangeLog
dak/override.py
dak/rm.py
templates/override.bug-close
templates/process-accepted.install
templates/process-accepted.unaccept
templates/process-new.bxa_notification
templates/process-new.prod
templates/process-unchecked.accepted
templates/process-unchecked.announce
templates/process-unchecked.bug-close
templates/process-unchecked.bug-experimental-fixed
templates/process-unchecked.bug-nmu-fixed
templates/process-unchecked.new
templates/process-unchecked.override-disparity
templates/queue.rejected
templates/reject-proposed-updates.rejected
templates/rm.bug-close
tools/debianqueued-0.9/ChangeLog
tools/debianqueued-0.9/debianqueued
=== modified file 'ChangeLog'
--- a/ChangeLog 2008-05-06 21:51:11 +0000
+++ b/ChangeLog 2008-05-07 22:43:45 +0000
@@ -1,3 +1,35 @@
+2008-05-08 Joerg Jaspert <joerg@debian.org>
+
+ * templates/rm.bug-close: dito
+
+ * templates/reject-proposed-updates.rejected: dito
+
+ * templates/queue.rejected: dito
+
+ * templates/process-unchecked.override-disparity: dito, but also
+ mention that people should include the package lists with the
+ override disparities.
+
+ * templates/process-unchecked.new: dito
+
+ * templates/process-unchecked.bug-nmu-fixed: dito
+
+ * templates/process-unchecked.bug-experimental-fixed: dito
+
+ * templates/process-unchecked.bug-close: dito
+
+ * templates/process-unchecked.announce: dito
+
+ * templates/process-unchecked.accepted: dito
+
+ * templates/process-new.prod: dito
+
+ * templates/process-accepted.unaccept: dito
+
+ * templates/process-accepted.install: dito
+
+ * templates/override.bug-close: Add X-Debian header
+
2008-05-06 Joerg Jaspert <joerg@debian.org>
* config/debian/cron.dinstall: Put the timestamp stuff into an own
=== modified file 'dak/override.py'
--- a/dak/override.py 2008-05-05 19:32:00 +0000
+++ b/dak/override.py 2008-05-07 22:43:45 +0000
@@ -247,7 +247,7 @@
Subst["__BCC__"] = "Bcc: " + ", ".join(bcc)
else:
Subst["__BCC__"] = "X-Filler: 42"
- Subst["__CC__"] = "X-DAK: dak override\nX-Katie: alicia $Revision: 1.6$"
+ Subst["__CC__"] = "X-DAK: dak override\nX-Katie: alicia"
Subst["__ADMIN_ADDRESS__"] = Cnf["Dinstall::MyAdminAddress"]
Subst["__DISTRO__"] = Cnf["Dinstall::MyDistribution"]
Subst["__WHOAMI__"] = utils.whoami()
=== modified file 'dak/rm.py'
--- a/dak/rm.py 2008-05-05 19:32:00 +0000
+++ b/dak/rm.py 2008-05-07 22:43:45 +0000
@@ -511,7 +511,7 @@
Subst["__BCC__"] = "Bcc: " + ", ".join(bcc)
else:
Subst["__BCC__"] = "X-Filler: 42"
- Subst["__CC__"] = "X-DAK: dak rm\nX-Katie: melanie $Revision: 1.44 $"
+ Subst["__CC__"] = "X-DAK: dak rm\nX-Katie: melanie"
if carbon_copy:
Subst["__CC__"] += "\nCc: " + ", ".join(carbon_copy)
Subst["__SUITE_LIST__"] = suites_list
=== modified file 'templates/override.bug-close'
--- a/templates/override.bug-close 2008-05-01 21:45:34 +0000
+++ b/templates/override.bug-close 2008-05-07 22:43:45 +0000
@@ -2,6 +2,7 @@
To: __BUG_NUMBER__-close@__BUG_SERVER__
__CC__
__BCC__
+X-Debian: DAK
MIME-Version: 1.0
Content-Type: text/plain; charset="utf-8"
Content-Transfer-Encoding: 8bit
=== modified file 'templates/process-accepted.install'
--- a/templates/process-accepted.install 2008-05-01 21:45:34 +0000
+++ b/templates/process-accepted.install 2008-05-07 22:43:45 +0000
@@ -1,6 +1,7 @@
From: __DAK_ADDRESS__
To: __MAINTAINER_TO__
__BCC__
+X-Debian: DAK
Precedence: bulk
MIME-Version: 1.0
Content-Type: text/plain; charset="utf-8"
=== modified file 'templates/process-accepted.unaccept'
--- a/templates/process-accepted.unaccept 2008-05-01 21:45:34 +0000
+++ b/templates/process-accepted.unaccept 2008-05-07 22:43:45 +0000
@@ -2,6 +2,7 @@
To: __MAINTAINER_TO__
__CC__
__BCC__
+X-Debian: DAK
MIME-Version: 1.0
Content-Type: text/plain; charset="utf-8"
Content-Transfer-Encoding: 8bit
=== modified file 'templates/process-new.bxa_notification'
--- a/templates/process-new.bxa_notification 2008-05-01 21:45:34 +0000
+++ b/templates/process-new.bxa_notification 2008-05-07 22:43:45 +0000
@@ -2,6 +2,7 @@
X-Not-Really-To: crypt@bis.doc.gov, enc@nsa.gov, web_site@bis.doc.gov
To: bxa@ftp-master.debian.org
__BCC__
+X-Debian: DAK
Precedence: junk
MIME-Version: 1.0
Content-Type: text/plain; charset="utf-8"
=== modified file 'templates/process-new.prod'
--- a/templates/process-new.prod 2008-05-01 21:45:34 +0000
+++ b/templates/process-new.prod 2008-05-07 22:43:45 +0000
@@ -1,6 +1,7 @@
From: __FROM_ADDRESS__
To: __MAINTAINER_TO__
__CC__
+X-Debian: DAK
MIME-Version: 1.0
Content-Type: text/plain; charset="utf-8"
Content-Transfer-Encoding: 8bit
=== modified file 'templates/process-unchecked.accepted'
--- a/templates/process-unchecked.accepted 2008-05-01 21:45:34 +0000
+++ b/templates/process-unchecked.accepted 2008-05-07 22:43:45 +0000
@@ -1,6 +1,7 @@
From: __DAK_ADDRESS__
To: __MAINTAINER_TO__
__BCC__
+X-Debian: DAK
Precedence: bulk
MIME-Version: 1.0
Content-Type: text/plain; charset="utf-8"
=== modified file 'templates/process-unchecked.announce'
--- a/templates/process-unchecked.announce 2008-05-01 21:45:34 +0000
+++ b/templates/process-unchecked.announce 2008-05-07 22:43:45 +0000
@@ -1,6 +1,7 @@
From: __MAINTAINER_FROM__
To: __ANNOUNCE_LIST_ADDRESS__
__BCC__
+X-Debian: DAK
MIME-Version: 1.0
Content-Type: text/plain; charset="utf-8"
Content-Transfer-Encoding: 8bit
=== modified file 'templates/process-unchecked.bug-close'
--- a/templates/process-unchecked.bug-close 2008-05-01 21:45:34 +0000
+++ b/templates/process-unchecked.bug-close 2008-05-07 22:43:45 +0000
@@ -1,6 +1,7 @@
From: __MAINTAINER_FROM__
To: __BUG_NUMBER__-close@__BUG_SERVER__
__BCC__
+X-Debian: DAK
MIME-Version: 1.0
Content-Type: text/plain; charset="utf-8"
Content-Transfer-Encoding: 8bit
=== modified file 'templates/process-unchecked.bug-experimental-fixed'
--- a/templates/process-unchecked.bug-experimental-fixed 2008-05-01 21:45:34 +0000
+++ b/templates/process-unchecked.bug-experimental-fixed 2008-05-07 22:43:45 +0000
@@ -2,6 +2,7 @@
To: control@__BUG_SERVER__
Cc: __MAINTAINER_TO__
__BCC__
+X-Debian: DAK
MIME-Version: 1.0
Content-Type: text/plain; charset="utf-8"
Content-Transfer-Encoding: 8bit
=== modified file 'templates/process-unchecked.bug-nmu-fixed'
--- a/templates/process-unchecked.bug-nmu-fixed 2008-05-01 21:45:34 +0000
+++ b/templates/process-unchecked.bug-nmu-fixed 2008-05-07 22:43:45 +0000
@@ -2,6 +2,7 @@
To: control@__BUG_SERVER__
Cc: __MAINTAINER_TO__
__BCC__
+X-Debian: DAK
MIME-Version: 1.0
Content-Type: text/plain; charset="utf-8"
Content-Transfer-Encoding: 8bit
=== modified file 'templates/process-unchecked.new'
--- a/templates/process-unchecked.new 2008-05-01 21:45:34 +0000
+++ b/templates/process-unchecked.new 2008-05-07 22:43:45 +0000
@@ -1,6 +1,7 @@
From: __DAK_ADDRESS__
To: __MAINTAINER_TO__
__BCC__
+X-Debian: DAK
Precedence: bulk
MIME-Version: 1.0
Content-Type: text/plain; charset="utf-8"
=== modified file 'templates/process-unchecked.override-disparity'
--- a/templates/process-unchecked.override-disparity 2008-05-01 21:45:34 +0000
+++ b/templates/process-unchecked.override-disparity 2008-05-07 22:43:45 +0000
@@ -1,6 +1,7 @@
From: __DAK_ADDRESS__
To: __MAINTAINER_TO__
__BCC__
+X-Debian: DAK
Precedence: junk
MIME-Version: 1.0
Content-Type: text/plain; charset="utf-8"
@@ -15,6 +16,8 @@
the override is correct and the package wrong please fix the package
so that this disparity is fixed in the next upload. If you feel the
override is incorrect then please reply to this mail and explain why.
+Please INCLUDE the list of packages as seen above, or we won't be able
+to deal with your mail due to missing information.
[NB: this is an automatically generated mail; if you replied to one
like it before and have not received a response yet, please ignore
=== modified file 'templates/queue.rejected'
--- a/templates/queue.rejected 2008-05-01 21:45:34 +0000
+++ b/templates/queue.rejected 2008-05-07 22:43:45 +0000
@@ -2,6 +2,7 @@
To: __MAINTAINER_TO__
__BCC__
__CC__
+X-Debian: DAK
Precedence: bulk
MIME-Version: 1.0
Content-Type: text/plain; charset="utf-8"
=== modified file 'templates/reject-proposed-updates.rejected'
--- a/templates/reject-proposed-updates.rejected 2008-05-01 21:45:34 +0000
+++ b/templates/reject-proposed-updates.rejected 2008-05-07 22:43:45 +0000
@@ -2,6 +2,7 @@
To: __MAINTAINER_TO__
__CC__
__BCC__
+X-Debian: DAK
Precedence: bulk
MIME-Version: 1.0
Content-Type: text/plain; charset="utf-8"
=== modified file 'templates/rm.bug-close'
--- a/templates/rm.bug-close 2008-05-01 21:45:34 +0000
+++ b/templates/rm.bug-close 2008-05-07 22:43:45 +0000
@@ -2,6 +2,7 @@
To: __BUG_NUMBER__-close@__BUG_SERVER__
__CC__
__BCC__
+X-Debian: DAK
MIME-Version: 1.0
Content-Type: text/plain; charset="utf-8"
Content-Transfer-Encoding: 8bit
=== modified file 'tools/debianqueued-0.9/ChangeLog'
--- a/tools/debianqueued-0.9/ChangeLog 2008-04-25 18:18:37 +0000
+++ b/tools/debianqueued-0.9/ChangeLog 2008-05-07 22:43:45 +0000
@@ -1,3 +1,6 @@
+2008-05-08 Joerg Jaspert <joerg@debian.org>
+
+ * debianqueued: added header X-Debian: DAK
-- Version 0.9 released
=== modified file 'tools/debianqueued-0.9/debianqueued'
--- a/tools/debianqueued-0.9/debianqueued 2008-04-25 18:18:37 +0000
+++ b/tools/debianqueued-0.9/debianqueued 2008-05-07 22:43:45 +0000
@@ -2077,7 +2077,7 @@
my $file = shift;
$main::mail_addr = "";
- $main::mail_text = "";
+ $main::mail_text = "X-Debian: DAK\n";
$main::mail_subject = $file ? "Processing of $file" : "";
}
Reply to: