session: Also log dbus connection exceptions

[waydroid.git] / tools / actions / upgrader.py

diff --git a/tools/actions/upgrader.py b/tools/actions/upgrader.py
index 605de441e040546c3b705feab1e148326a97bf9a..dcd033d3e3e0f1020bb3cce4d004adc3f6a0c279 100644 (file)
--- a/tools/actions/upgrader.py
+++ b/tools/actions/upgrader.py
@@ -3,6 +3,7 @@
 import logging
 import os
 from tools import helpers
+from tools.helpers.version import versiontuple
 import tools.config
 import dbus
 
@@ -16,9 +17,6 @@ def get_config(args):
     args.session = None
 
 def migration(args):
-    def versiontuple(v):
-        return tuple(map(int, (v.split("."))))
-
     try:
         old_ver = tools.helpers.props.file_get(args, args.work + "/waydroid_base.prop", "waydroid.tools_version")
         if versiontuple(old_ver) <= versiontuple("1.3.4"):
@@ -48,6 +46,7 @@ def upgrade(args):
             helpers.images.get(args)
         else:
             logging.info("Upgrade refused because a pre-installed image is detected at {}.".format(args.images_path))
+    helpers.drivers.probeAshmemDriver(args)
     helpers.lxc.setup_host_perms(args)
     helpers.lxc.set_lxc_config(args)
     helpers.lxc.make_base_props(args)