[Updater] Send email with only relative path am: 38dda433 am: f4cf9ea2

am: 4896a435

Change-Id: Id669bc422f628acd3788b64ba40bd7ecd2d93530

external_updater.py

@@ -129,7 +129,8 @@ def _process_update_result(path):
 def _check_some(paths, delay):
     results = {}
     for path in paths:
-        results[path] = _process_update_result(path)
+        relative_path = fileutils.get_relative_project_path(path)
+        results[relative_path] = _process_update_result(path)
         time.sleep(delay)
     return results
 
@@ -141,7 +142,8 @@ def _check_all(delay):
         if fileutils.METADATA_FILENAME in files:
             # Skip sub directories.
             dirs[:] = []
-            results[path] = _process_update_result(path)
+            relative_path = fileutils.get_relative_project_path(path)
+            results[relative_path] = _process_update_result(path)
             time.sleep(delay)
     return results
 
@@ -204,7 +206,7 @@ def _do_update(args):
         git_utils.push(full_path, args.remote_name)
 
     if args.branch_and_commit:
-        git_utils.checkout(full_path, 'aosp/master')
+        git_utils.checkout(full_path, args.remote_name + '/master')
 
 
 def parse_args():

notifier.py

@@ -134,7 +134,7 @@ def send_notification(args):
     _process_results(args, history, results)
 
     with open(args.history, 'w') as f:
-        json.dump(history, f, sort_keys=True)
+        json.dump(history, f, sort_keys=True, indent=4)
 
 
 def _upgrade(proj):