From d3e2544875bb8139b4efed44b8239320d7712be2 Mon Sep 17 00:00:00 2001 From: Carlos Nihelton Date: Wed, 6 Apr 2022 13:25:35 -0300 Subject: [PATCH] Ensures snap_dir='/' if not better specified. UDI sets the SNAP env var to '.' for development purposes. See: https://github.com/canonical/ubuntu-desktop-installer/commit/9eb6f04 It is unlikely that under test or production that env var will ever by just '.'. On the other hand in dry-run we want this controller to interpret it as '/' if not properly set, thus discarding the '.'. --- system_setup/server/controllers/configure.py | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/system_setup/server/controllers/configure.py b/system_setup/server/controllers/configure.py index e0a77733..6bc85ba5 100644 --- a/system_setup/server/controllers/configure.py +++ b/system_setup/server/controllers/configure.py @@ -145,6 +145,13 @@ class ConfigureController(SubiquityController): packages = [] # Running that command doesn't require root. snap_dir = os.getenv("SNAP", default="/") + # UDI sets the SNAP env var to '.' for development purposes. + # See: + # https://github.com/canonical/ubuntu-desktop-installer/commit/9eb6f04 + # It is unlikely that under test or production that env var will + # ever by just '.'. On the other hand in dry-run we want it pointing to + # '/' if not properly set. + snap_dir = snap_dir if snap_dir != '.' else '/' data_dir = os.path.join(snap_dir, "usr/share/language-selector") if not os.path.exists(data_dir): log.error("Misconfigured snap environment pointed L-S-C data dir"