From 79fada5c36517e2a12fc871567d54528f86a947a Mon Sep 17 00:00:00 2001 From: Nbiba Bedis Date: Thu, 30 Sep 2021 22:07:20 +0100 Subject: [PATCH] upgrade: log that no we will not upgrade if a preinstalled image exists --- tools/actions/upgrader.py | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/tools/actions/upgrader.py b/tools/actions/upgrader.py index 71a64e7..2400023 100644 --- a/tools/actions/upgrader.py +++ b/tools/actions/upgrader.py @@ -25,8 +25,11 @@ def upgrade(args): helpers.images.umount_rootfs(args) helpers.drivers.loadBinderNodes(args) if not args.offline: - if args.images_path != tools.config.defaults["preinstalled_images_path"]: + 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) -- 2.47.3