From 2ef7affa31b4496eb295d20c63a24ebaf992a0e3 Mon Sep 17 00:00:00 2001 From: Richard Purdie Date: Mon, 1 Aug 2022 14:17:21 +0100 Subject: oeqa/sdk/rust: Fix file deletion for multilib SDKs We need to use shutil.rmtree here since removedirs() only covers directories. Make the exception for specific too to make errors easier to catch. (From OE-Core rev: 9d2a661e46123a2292f7887658e6fa54923dbcc0) Signed-off-by: Richard Purdie --- meta/lib/oeqa/sdk/cases/rust.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'meta') diff --git a/meta/lib/oeqa/sdk/cases/rust.py b/meta/lib/oeqa/sdk/cases/rust.py index c122b64d0c..1075d37b49 100644 --- a/meta/lib/oeqa/sdk/cases/rust.py +++ b/meta/lib/oeqa/sdk/cases/rust.py @@ -19,8 +19,8 @@ class RustCompileTest(OESDKTestCase): def setUpClass(self): targetdir = os.path.join(self.tc.sdk_dir, "hello") try: - os.removedirs(targetdir) - except OSError: + shutil.rmtree(targetdir) + except FileNotFoundError: pass shutil.copytree(os.path.join(self.tc.sdk_files_dir, "rust/hello"), targetdir) -- cgit v1.2.3-54-g00ecf