Message ID | 1382377377-4716-1-git-send-email-luis.henriques@canonical.com |
---|---|
State | New |
Headers | show |
On Mon, 2013-10-21 at 18:42 +0100, Luis Henriques wrote: > When a patch is queued to, for example, the 3.8 kernel, the email subject will > be: > > [ 3.8.y.z extended stable ] Patch "..." has been added to staging queue > > This patch removes the extra whitespaces from the square brackets. > > Signed-off-by: Luis Henriques <luis.henriques@canonical.com> > --- > stable/notify-stable-patch-queued | 2 +- > stable/notify-stable-review | 3 +-- > 2 files changed, 2 insertions(+), 3 deletions(-) > > diff --git a/stable/notify-stable-patch-queued b/stable/notify-stable-patch-queued > index 494583e..3fc7d0f 100755 > --- a/stable/notify-stable-patch-queued > +++ b/stable/notify-stable-patch-queued > @@ -93,7 +93,7 @@ def AssembleMailBody(version, subject, patchlines): > else: > tversion_para = "" > mailbody = [ > - "Subject: [ " + version + " extended stable ] Patch \"" + subject + > + "Subject: [" + version + " extended stable] Patch \"" + subject + > "\" has been added to staging queue", > "X-Extended-Stable: " + bversion[:-1], > "", > diff --git a/stable/notify-stable-review b/stable/notify-stable-review > index ce6120c..307746c 100755 > --- a/stable/notify-stable-review > +++ b/stable/notify-stable-review > @@ -252,7 +252,7 @@ see https://wiki.ubuntu.com/Kernel/Dev/ExtendedStable . > mailbody += "From: " + sender + '\n' > for entry in self.tolist: > mailbody += "To: " + entry + '\n' > - mailbody += ("Subject: [ %s extended stable ] Linux %s stable review" > + mailbody += ("Subject: [%s extended stable] Linux %s stable review" > % (ann_ver, new_ver) + "\n") > mailbody += "X-Extended-Stable: %s\n" % (main_ver) > mailbody += self.message_text(base_ver, new_ver, patch_cnt, sender) > @@ -492,4 +492,3 @@ if __name__ == '__main__': > app.main() > > # vi:set ts=4 sw=4 expandtab: > - > -- > 1.8.3.2 > >
Cheers, -- Luis
diff --git a/stable/notify-stable-patch-queued b/stable/notify-stable-patch-queued index 494583e..3fc7d0f 100755 --- a/stable/notify-stable-patch-queued +++ b/stable/notify-stable-patch-queued @@ -93,7 +93,7 @@ def AssembleMailBody(version, subject, patchlines): else: tversion_para = "" mailbody = [ - "Subject: [ " + version + " extended stable ] Patch \"" + subject + + "Subject: [" + version + " extended stable] Patch \"" + subject + "\" has been added to staging queue", "X-Extended-Stable: " + bversion[:-1], "", diff --git a/stable/notify-stable-review b/stable/notify-stable-review index ce6120c..307746c 100755 --- a/stable/notify-stable-review +++ b/stable/notify-stable-review @@ -252,7 +252,7 @@ see https://wiki.ubuntu.com/Kernel/Dev/ExtendedStable . mailbody += "From: " + sender + '\n' for entry in self.tolist: mailbody += "To: " + entry + '\n' - mailbody += ("Subject: [ %s extended stable ] Linux %s stable review" + mailbody += ("Subject: [%s extended stable] Linux %s stable review" % (ann_ver, new_ver) + "\n") mailbody += "X-Extended-Stable: %s\n" % (main_ver) mailbody += self.message_text(base_ver, new_ver, patch_cnt, sender) @@ -492,4 +492,3 @@ if __name__ == '__main__': app.main() # vi:set ts=4 sw=4 expandtab: -
When a patch is queued to, for example, the 3.8 kernel, the email subject will be: [ 3.8.y.z extended stable ] Patch "..." has been added to staging queue This patch removes the extra whitespaces from the square brackets. Signed-off-by: Luis Henriques <luis.henriques@canonical.com> --- stable/notify-stable-patch-queued | 2 +- stable/notify-stable-review | 3 +-- 2 files changed, 2 insertions(+), 3 deletions(-)