props: Use subprocess for host getprop

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

diff --git a/tools/actions/upgrader.py b/tools/actions/upgrader.py
index cb1aaa5bdd66fc9c7f3c7d0fd24e0ea86dc86585..2400023af905fc4d6bc51d440a7c285149f5e8a4 100644 (file)
--- a/tools/actions/upgrader.py
+++ b/tools/actions/upgrader.py
@@ -25,7 +25,11 @@ def upgrade(args):
     helpers.images.umount_rootfs(args)
     helpers.drivers.loadBinderNodes(args)
     if not args.offline:
     helpers.images.umount_rootfs(args)
     helpers.drivers.loadBinderNodes(args)
     if not args.offline:

-        helpers.images.get(args)
+        preinstalled_images_path = tools.config.defaults["preinstalled_images_path"]
+        if args.images_path != preinstalled_images_path:
+            helpers.images.get(args)
+        else:
+            logging.info("Upgrade refused because a pre-installed image is detected at {}.".format(preinstalled_images_path))

     helpers.lxc.setup_host_perms(args)
     helpers.lxc.set_lxc_config(args)
     helpers.lxc.make_base_props(args)
     helpers.lxc.setup_host_perms(args)
     helpers.lxc.set_lxc_config(args)
     helpers.lxc.make_base_props(args)