Skip to content

Commit f4e1696

Browse files
committed
yanglint UPDATE use installed search dir if not local build
1 parent 3962d23 commit f4e1696

2 files changed

Lines changed: 4 additions & 4 deletions

File tree

‎tools/lint/main.c‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -63,8 +63,8 @@ main(int argc, char *argv[])
6363
search_dir = getenv("YANGLINT_INTERNAL_MODULES_DIR");
6464
if (!search_dir) {
6565
search_dir = ly_yang_module_dir();
66-
if (access(search_dir, F_OK)) {
67-
/* assume running in local build */
66+
if (access(search_dir, F_OK) && !access("../modules", F_OK)) {
67+
/* running in local build */
6868
search_dir = "../modules";
6969
}
7070
}

‎tools/lint/main_ni.c‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -887,8 +887,8 @@ process_args(int argc, char *argv[], struct yl_opt *yo, struct ly_ctx **ctx)
887887
search_path = getenv("YANGLINT_INTERNAL_MODULES_DIR");
888888
if (!search_path) {
889889
search_path = ly_yang_module_dir();
890-
if (access(search_path, F_OK)) {
891-
/* assume running in local build */
890+
if (access(search_path, F_OK) && !access("../modules", F_OK)) {
891+
/* running in local build */
892892
search_path = "../modules";
893893
}
894894
}

0 commit comments

Comments
 (0)