From: "Aníbal Limón" <anibal.limon@linux.intel.com>
To: yocto@yoctoproject.org
Cc: paul.eggleton@linux.intel.com
Subject: [PATCH 05/11][auh] upgrade_helper.py: Make notice of License change into email.
Date: Wed, 10 Jun 2015 16:28:46 +0000 [thread overview]
Message-ID: <1433953732-29963-6-git-send-email-anibal.limon@linux.intel.com> (raw)
In-Reply-To: <1433953732-29963-1-git-send-email-anibal.limon@linux.intel.com>
When license change it need to be specified into email to maintainers
for review it.
Add get_license_diff_file_name method to recipe class for get it
into email handler and write information about it.
[YOCTO 7186]
Signed-off-by: Aníbal Limón <anibal.limon@linux.intel.com>
---
recipe.py | 7 +++++++
upgradehelper.py | 53 ++++++++++++++++++++++++++++++-----------------------
2 files changed, 37 insertions(+), 23 deletions(-)
diff --git a/recipe.py b/recipe.py
index 8ecd2a2..55eb5bf 100644
--- a/recipe.py
+++ b/recipe.py
@@ -394,6 +394,13 @@ class Recipe(object):
return False
+ def get_license_diff_file_name(self):
+ file_name = None
+ if not self.license_diff_file is None:
+ file_name = os.path.basename(self.license_diff_file)
+
+ return file_name
+
def _get_failed_recipes(self, output):
failed_tasks = dict()
machine = None
diff --git a/upgradehelper.py b/upgradehelper.py
index 74f9c0a..953f86e 100755
--- a/upgradehelper.py
+++ b/upgradehelper.py
@@ -124,26 +124,6 @@ def parse_config_file(config_file):
return (settings, maintainer_override)
class Updater(object):
- mail_header = \
- "Hello,\n\nYou are receiving this email because you are the maintainer\n" \
- "of *%s* recipe and this is to let you know that the automatic attempt\n" \
- "to upgrade the recipe to *%s* has %s.\n\n"
-
- next_steps_info = \
- "The recipe has been successfully compiled for all major architectures.\n\n" \
- "Next steps:\n" \
- " - apply the patch: git am %s\n" \
- " - check that required patches have not been removed from the recipe\n" \
- " - compile an image that contains the package\n" \
- " - perform some basic sanity tests\n" \
- " - amend the patch and sign it off: git commit -s --reset-author --amend\n" \
- " - send it to the list\n\n" \
-
- mail_footer = \
- "Attached are the patch and the logs (+ license file diff) in case of failure.\n\n" \
- "Regards,\nThe Upgrade Helper"
-
-
def __init__(self, auto_mode=False, send_email=False, skip_compilation=False):
self.uh_dir = get_build_dir() + "/upgrade-helper"
@@ -375,6 +355,29 @@ class Updater(object):
self.git.clean_untracked()
if self.send_email:
+ mail_header = \
+ "Hello,\n\nYou are receiving this email because you are the maintainer\n" \
+ "of *%s* recipe and this is to let you know that the automatic attempt\n" \
+ "to upgrade the recipe to *%s* has %s.\n\n"
+
+ license_change_info = \
+ "*LICENSE CHANGED* please review the %s file and update the LICENSE\n" \
+ "variable in the recipe if is needed.\n\n"
+
+ next_steps_info = \
+ "The recipe has been successfully compiled for all major architectures.\n\n" \
+ "Next steps:\n" \
+ " - apply the patch: git am %s\n" \
+ " - check that required patches have not been removed from the recipe\n" \
+ " - compile an image that contains the package\n" \
+ " - perform some basic sanity tests\n" \
+ " - amend the patch and sign it off: git commit -s --reset-author --amend\n" \
+ " - send it to the list\n\n" \
+
+ mail_footer = \
+ "Attached are the patch, license diff (if change) and bitbake log.\n\n" \
+ "Regards,\nThe Upgrade Helper"
+
# don't bother maintainer with mail if the recipe is already up to date
if status == "UpgradeNotNeededError":
return
@@ -390,13 +393,17 @@ class Updater(object):
else:
subject += " FAILED"
- msg_body = self.mail_header % (self.pn, self.new_ver,
+ msg_body = mail_header % (self.pn, self.new_ver,
self._get_status_msg(err))
+ license_diff_fn = self.recipe.get_license_diff_file_name()
+ if license_diff_fn:
+ msg_body += license_change_info % license_diff_fn
+
if err is None:
- msg_body += self.next_steps_info % os.path.basename(self.patch_file)
+ msg_body += next_steps_info % os.path.basename(self.patch_file)
- msg_body += self.mail_footer
+ msg_body += mail_footer
# Add possible attachments to email
attachments = []
--
1.8.4.5
next prev parent reply other threads:[~2015-06-10 16:30 UTC|newest]
Thread overview: 16+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-06-10 16:28 [PATCH 00/11][auh]: Add support of new upstream mechanism and improvments Aníbal Limón
2015-06-10 16:28 ` [PATCH 01/11][auh] upgradehelper.py: Fix status_msg in pkg_upgrade_handler Aníbal Limón
2015-06-10 16:28 ` [PATCH 02/11][auh] upgradehelper.py: Make usage of new upstream detection mechanism Aníbal Limón
2015-06-10 16:28 ` [PATCH 03/11][auh] upgradehelper.py: Use settings.from as email for commits Aníbal Limón
2015-06-10 16:28 ` [PATCH 04/11][auh] upgradehelper.py: Improve usage when try to upgrade one recipe Aníbal Limón
2015-06-10 16:28 ` Aníbal Limón [this message]
2015-06-10 16:28 ` [PATCH 06/11][auh] upgradehelper.py: Add specific information about machines build succeed Aníbal Limón
2015-06-10 16:28 ` [PATCH 07/11][auh] upgradehelper.py: Move recipe work into upgradehelper work dir Aníbal Limón
2015-06-10 16:28 ` [PATCH 08/11][auh] upgradehelper.py: Fix interactive mode when recipe upgrade finish Aníbal Limón
2015-06-10 16:28 ` [PATCH 09/11][auh] upgradehelper.py: Change policy for send emails and fix error passing Aníbal Limón
2015-06-11 20:51 ` Paul Eggleton
2015-06-11 20:56 ` Aníbal Limón
2015-06-11 21:05 ` Paul Eggleton
2015-06-11 21:18 ` Aníbal Limón
2015-06-10 16:28 ` [PATCH 10/11][auh] upgradehelper.py: Change print to logger info Aníbal Limón
2015-06-10 16:28 ` [PATCH 11/11][auh] README: Edit Maintainece section to add current maintainer Aníbal Limón
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1433953732-29963-6-git-send-email-anibal.limon@linux.intel.com \
--to=anibal.limon@linux.intel.com \
--cc=paul.eggleton@linux.intel.com \
--cc=yocto@yoctoproject.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.