fix errors- manual patching

tools/container.py

@@ -1,23 +1,9 @@
 import configparser
 import os
 import sys
-# import dbus
 from tools.helper import run
 from tools.logger import Logger
 
-# def DBusContainerService(object_path="/ContainerManager", intf="id.waydro.ContainerManager"):
-#     return dbus.Interface(dbus.SystemBus().get_object("id.waydro.Container", object_path), intf)
-
-# def DBusSessionService(object_path="/SessionManager", intf="id.waydro.SessionManager"):
-#     return dbus.Interface(dbus.SessionBus().get_object("id.waydro.Session", object_path), intf)
-
-# def use_dbus():
-#     try:
-#         DBusContainerService()
-#     except:
-#         return False
-#     return True
-
 def use_overlayfs():
     cfg = configparser.ConfigParser()
     cfg_file = os.environ.get("WAYDROID_CONFIG", "/var/lib/waydroid/waydroid.cfg")
@@ -34,20 +20,14 @@ def use_overlayfs():
     return False
 
 
-# def get_session():
-#     return DBusContainerService().GetSession()
-
 def stop():
-    # if use_dbus():
-    #     session = DBusContainerService().GetSession()
-    #     if session:
-    #         DBusContainerService().Stop(False)
-    # else:
         run(["waydroid", "container", "stop"])
 
-
 def is_running():
         return "Session:\tRUNNING" in run(["waydroid", "status"]).stdout.decode()
 
 def upgrade():
-    run(["waydroid", "upgrade", "-o"], ignore=r"\[.*\] Stopping container\n\[.*\] Starting container")
+    try:
+        run(["waydroid", "upgrade"], ignore=r"\[.*\] Stopping container\n\[.*\] Starting container")
+    except subprocess.CalledProcessError:
+        Logger.warning("Waydroid upgrade reported an error (likely system_ota), but we are continuing...")