Merge "[Updater] Include owners file in email" am: b77119e0f5 am: c3f92dc0f1
am: 15fe5d287d
Change-Id: If320f0fc0f2479cbc8d468795e2fd944e77320e2
diff --git a/notifier.py b/notifier.py
index 455a5b9..d19c627 100644
--- a/notifier.py
+++ b/notifier.py
@@ -57,10 +57,23 @@
return parser.parse_args()
+ANDROID_TOP = os.path.normpath(os.path.join(__file__, '../../..'))
+def _get_android_top():
+ return ANDROID_TOP
+
+
CHANGE_URL_PATTERN = r'(https:\/\/[^\s]*android-review[^\s]*) Upgrade'
CHANGE_URL_RE = re.compile(CHANGE_URL_PATTERN)
+def _read_owner_file(proj):
+ owner_file = os.path.join(_get_android_top(), 'external', proj, 'OWNERS')
+ if not os.path.isfile(owner_file):
+ return None
+ with open(owner_file, 'r') as f:
+ return f.read().strip()
+
+
def _send_email(proj, latest_ver, recipient, upgrade_log):
print('Sending email for {}: {}'.format(proj, latest_ver))
msg = "New version: {}".format(latest_ver)
@@ -69,6 +82,11 @@
msg += '\n\nAn upgrade change is generated at:\n{}'.format(
match.group(1))
+ owners = _read_owner_file(proj)
+ if owners:
+ msg += '\n\nOWNERS file: \n'
+ msg += owners
+
msg += '\n\n'
msg += upgrade_log
@@ -142,7 +160,7 @@
'update', '--branch_and_commit', '--push_change',
proj],
stdout=subprocess.PIPE, stderr=subprocess.PIPE,
- cwd=os.environ['ANDROID_BUILD_TOP'])
+ cwd=_get_android_top())
stdout = out.stdout.decode('utf-8')
stderr = out.stderr.decode('utf-8')
return """
@@ -166,7 +184,7 @@
else:
params += args.paths
- subprocess.run(params, cwd=os.environ['ANDROID_BUILD_TOP'])
+ subprocess.run(params, cwd=_get_android_top())
def main():
