From 61af5f249495b18f45ca164376c871081448c0e4 Mon Sep 17 00:00:00 2001 From: "Kubacki, Michael A" Date: Wed, 2 Oct 2019 06:57:56 +0800 Subject: BaseTools: Fix GenMake multi-workspace failure REF:https://bugzilla.tianocore.org/show_bug.cgi?id=2232 Commit 0075ab2cec introduced an issue that causes an exception when multiple workspace packages paths are specified. For example, if edk2-platforms is used, the root directory will contain an edk and edk2-platforms directory representing the respective repositories. In GenMake, the path to the package DEC file for a module is discovered by getting the relative path of the INF to the workspace root directory. Each directory in the relative path is incrementally joined to the WORKSPACE directory. The file list in the joined path is searched for a DEC file. As an example, if the build command is used on a package outside the edk2 repository, the INF file path is relative to the edk2-platforms directory not edk2. This causes directory paths to be built that do not exist. Commit 0075ab2cec replaced the os.path.exists() call with a try except block that always fails when os.listdir() is invoked to enumerate the list of files in the built directory path on packages outside edk2. This commit restores the original conditional statement which avoids calling os.listdir() with an invalid directory path. Cc: Bob Feng Cc: Liming Gao Cc: Michael D Kinney Signed-off-by: Michael Kubacki Reviewed-by: Michael D Kinney Reviewed-by: Bob Feng --- BaseTools/Source/Python/AutoGen/GenMake.py | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) (limited to 'BaseTools') diff --git a/BaseTools/Source/Python/AutoGen/GenMake.py b/BaseTools/Source/Python/AutoGen/GenMake.py index 584156d..97ba158 100755 --- a/BaseTools/Source/Python/AutoGen/GenMake.py +++ b/BaseTools/Source/Python/AutoGen/GenMake.py @@ -637,13 +637,11 @@ cleanlib: while not found and os.sep in package_rel_dir: index = package_rel_dir.index(os.sep) current_dir = mws.join(current_dir, package_rel_dir[:index]) - try: + if os.path.exists(current_dir): for fl in os.listdir(current_dir): if fl.endswith('.dec'): found = True break - except: - EdkLogger.error('build', FILE_NOT_FOUND, "WORKSPACE does not exist.") package_rel_dir = package_rel_dir[index + 1:] MakefileTemplateDict = { -- cgit v1.1