From dd3d4b0367272a5826a9a51afa26f426dd003e5d Mon Sep 17 00:00:00 2001 From: Paul Eggleton Date: Mon, 26 Feb 2018 14:49:54 +1300 Subject: lib/oe/path: implement is_path_parent() In a few places we have checks to see path B is the parent of path A, by adding / to the end of the path B and then seeing if path A starts with the suffixed path B. Unfortunately there are two potential flaws: (1) path A needs to be suffixed with / as well or the directory itself won't match (semantics perhaps, but in a lot of scenarios returning True is correct); (2) you need to run os.path.abspath() on both paths first or you will wrongly return False for some relative paths where you should return True. Let's solve this once and for all by writing a function that takes care of these and put it in oe.path. Signed-off-by: Paul Eggleton Signed-off-by: Richard Purdie --- meta/lib/oe/path.py | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) diff --git a/meta/lib/oe/path.py b/meta/lib/oe/path.py index 1ea03d5d56..76c58fa760 100644 --- a/meta/lib/oe/path.py +++ b/meta/lib/oe/path.py @@ -237,3 +237,25 @@ def realpath(file, root, use_physdir = True, loop_cnt = 100, assume_dir = False) raise return file + +def is_path_parent(possible_parent, *paths): + """ + Return True if a path is the parent of another, False otherwise. + Multiple paths to test can be specified in which case all + specified test paths must be under the parent in order to + return True. + """ + def abs_path_trailing(pth): + pth_abs = os.path.abspath(pth) + if not pth_abs.endswith(os.sep): + pth_abs += os.sep + return pth_abs + + possible_parent_abs = abs_path_trailing(possible_parent) + if not paths: + return False + for path in paths: + path_abs = abs_path_trailing(path) + if not path_abs.startswith(possible_parent_abs): + return False + return True -- cgit 1.2.3-korg