From: Nbiba Bedis <bedisnbiba@gmail.com>
Date: Fri, 1 Oct 2021 07:58:28 +0000 (+0100)
Subject: session: don't panic when removing old userdata if its not empty
X-Git-Tag: 1.2.0~17
X-Git-Url: https://glassweightruler.freedombox.rocks/gitweb/waydroid.git/commitdiff_plain/f966cbf22b81960656a2f5694cf28af9171e49a1?ds=sidebyside

session: don't panic when removing old userdata if its not empty
---

diff --git a/tools/actions/session_manager.py b/tools/actions/session_manager.py
index 6b2f3eb..e1a0ba0 100644
--- a/tools/actions/session_manager.py
+++ b/tools/actions/session_manager.py
@@ -27,7 +27,7 @@ def start(args, unlocked_cb=None):
         if not os.path.isdir(waydroid_data):
             shutil.move(old_user_waydroid, cfg["session"]["xdg_data_home"])
         else:
-            os.removedirs(old_user_waydroid)
+            shutil.rmtree(old_user_waydroid, ignore_errors=True)
     if not os.path.isdir(waydroid_data):
         os.makedirs(waydroid_data)
     dpi = tools.helpers.props.host_get(args, "ro.sf.lcd_density")