Skip to content
Snippets Groups Projects
Commit f4cf9ea2 authored by Haibo Huang's avatar Haibo Huang Committed by android-build-merger
Browse files

[Updater] Send email with only relative path

am: 38dda433

Change-Id: I999c1b1f987d932b19689bd66f16f42764b31750
parents 56d44516 38dda433
No related branches found
No related tags found
No related merge requests found
...@@ -129,7 +129,8 @@ def _process_update_result(path): ...@@ -129,7 +129,8 @@ def _process_update_result(path):
def _check_some(paths, delay): def _check_some(paths, delay):
results = {} results = {}
for path in paths: 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) time.sleep(delay)
return results return results
...@@ -141,7 +142,8 @@ def _check_all(delay): ...@@ -141,7 +142,8 @@ def _check_all(delay):
if fileutils.METADATA_FILENAME in files: if fileutils.METADATA_FILENAME in files:
# Skip sub directories. # Skip sub directories.
dirs[:] = [] 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) time.sleep(delay)
return results return results
...@@ -204,7 +206,7 @@ def _do_update(args): ...@@ -204,7 +206,7 @@ def _do_update(args):
git_utils.push(full_path, args.remote_name) git_utils.push(full_path, args.remote_name)
if args.branch_and_commit: if args.branch_and_commit:
git_utils.checkout(full_path, 'aosp/master') git_utils.checkout(full_path, args.remote_name + '/master')
def parse_args(): def parse_args():
......
...@@ -134,7 +134,7 @@ def send_notification(args): ...@@ -134,7 +134,7 @@ def send_notification(args):
_process_results(args, history, results) _process_results(args, history, results)
with open(args.history, 'w') as f: 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): def _upgrade(proj):
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment