Snap for 6439596 from 1dc2143b13455b4ab0e2a0aa59dda791c0b0084f to qt-aml-tzdata-releaseandroid-mainline-10.0.0_r11android10-mainline-tzdata-release

Change-Id: Ie37325e5cfa55ec6debe5d3ff6a3437d98ca8e25

2 files changed, 4 insertions, 26 deletions

diff --git a/external_updater.py b/external_updater.py
index 1745549..5e2e944 100644
--- a/external_updater.py
+++ b/external_updater.py
@@ -21,7 +21,6 @@ updater.sh update kotlinc
 import argparse
 import json
 import os
-import sys
 import subprocess
 import time
 
@@ -36,12 +35,9 @@ import updater_utils
 
 UPDATERS = [GithubArchiveUpdater, GitUpdater]
 
-USE_COLOR = sys.stdout.isatty()
 
 def color_string(string, color):
     """Changes the color of a string when print to terminal."""
-    if not USE_COLOR:
-        return string
     colors = {
         'FRESH': '\x1b[32m',
         'STALE': '\x1b[31;1m',
@@ -182,7 +178,7 @@ TMP_BRANCH_NAME = 'tmp_auto_upgrade'
 
 
 def _do_update(args):
-    updater, _ = check_update(args.path)
+    updater, err = check_update(args.path)
     if updater is None:
         return
     if not has_new_version(updater) and not args.force:
@@ -193,7 +189,7 @@ def _do_update(args):
         git_utils.checkout(full_path, args.remote_name + '/master')
         try:
             git_utils.delete_branch(full_path, TMP_BRANCH_NAME)
-        except subprocess.CalledProcessError:
+        except subprocess.CalledProcessError as err:
             # Still continue if the branch doesn't exist.
             pass
         git_utils.start_branch(full_path, TMP_BRANCH_NAME)
diff --git a/notifier.py b/notifier.py
index d19c627..455a5b9 100644
--- a/notifier.py
+++ b/notifier.py
@@ -57,23 +57,10 @@ def parse_args():
     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)
@@ -82,11 +69,6 @@ def _send_email(proj, latest_ver, recipient, upgrade_log):
         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
 
@@ -160,7 +142,7 @@ def _upgrade(proj):
                           'update', '--branch_and_commit', '--push_change',
                           proj],
                          stdout=subprocess.PIPE, stderr=subprocess.PIPE,
-                         cwd=_get_android_top())
+                         cwd=os.environ['ANDROID_BUILD_TOP'])
     stdout = out.stdout.decode('utf-8')
     stderr = out.stderr.decode('utf-8')
     return """
@@ -184,7 +166,7 @@ def _check_updates(args):
     else:
         params += args.paths
 
-    subprocess.run(params, cwd=_get_android_top())
+    subprocess.run(params, cwd=os.environ['ANDROID_BUILD_TOP'])
 
 
 def main():