From: Richard Purdie <richard.purdie@linuxfoundation.org>
Date: Mon, 1 Aug 2022 13:17:21 +0000 (+0100)
Subject: oeqa/sdk/rust: Fix file deletion for multilib SDKs
X-Git-Tag: lucaceresoli/bug-15201-perf-libtraceevent-missing~3467
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=9d2a661e46123a2292f7887658e6fa54923dbcc0;p=thirdparty%2Fopenembedded%2Fopenembedded-core-contrib.git

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.

Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
---

diff --git a/meta/lib/oeqa/sdk/cases/rust.py b/meta/lib/oeqa/sdk/cases/rust.py
index c122b64d0c5..1075d37b49e 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)