diff options
| author | Treehugger Robot <treehugger-gerrit@google.com> | 2023-04-13 21:21:16 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2023-04-13 21:21:16 +0000 |
| commit | 5140f48edced50168cd2d71a282b1b0b32969d20 (patch) | |
| tree | 7a7a52ab6d9b07d446756412fabcf14edb5fd461 | |
| parent | af5c1550a77cfa86e2182d9b2a5296e615bffda3 (diff) | |
| parent | 01e228f8892bc1ddb8e2a4ce39343b5b697c5f4d (diff) | |
| download | bazel-5140f48edced50168cd2d71a282b1b0b32969d20.tar.gz | |
Merge "symlink_version_number expected in symlink forest" am: f38ce298db am: e40f4f5e47 am: 4d582dad51 am: 01e228f889
Original change: https://android-review.googlesource.com/c/platform/build/bazel/+/2535899
Change-Id: I7663937f690ab2bebe8ccfb5708ea80de1fe8628
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
| -rw-r--r-- | scripts/incremental_build/cuj_catalog.py | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/scripts/incremental_build/cuj_catalog.py b/scripts/incremental_build/cuj_catalog.py index 9377a889..e2d4868e 100644 --- a/scripts/incremental_build/cuj_catalog.py +++ b/scripts/incremental_build/cuj_catalog.py @@ -62,9 +62,12 @@ def verify_symlink_forest_has_only_symlink_leaves(): """Verifies that symlink forest has only symlinks or directories but no files except for merged BUILD.bazel files""" + top_in_ws = InWorkspace.ws_counterpart(util.get_top_dir()) def helper(d: Path): for child in os.scandir(d): child_path: Path = Path(child.path) + if child_path.name == 'symlink_forest_version' and d == top_in_ws: + continue if child_path.is_symlink(): continue if child_path.is_file() and child.name != 'BUILD.bazel': @@ -73,7 +76,7 @@ def verify_symlink_forest_has_only_symlink_leaves(): if child_path.is_dir(): helper(child_path) - helper(InWorkspace.ws_counterpart(util.get_top_dir())) + helper(top_in_ws) logging.info('VERIFIED Symlink Forest has no real files except BUILD.bazel') |