Jon Seager
64 lines
2.6 KiB
Diff
64 lines
2.6 KiB
Diff
diff --git i/craft_providers/base.py w/craft_providers/base.py
|
|
index 00f56ec..302f359 100644
|
|
--- i/craft_providers/base.py
|
|
+++ w/craft_providers/base.py
|
|
@@ -655,40 +655,24 @@ class Base(ABC):
|
|
),
|
|
)
|
|
|
|
- if snap.channel:
|
|
- try:
|
|
- snap_installer.install_from_store(
|
|
- executor=executor,
|
|
- snap_name=snap.name,
|
|
- channel=snap.channel,
|
|
- classic=snap.classic,
|
|
- )
|
|
- except SnapInstallationError as error:
|
|
- raise BaseConfigurationError(
|
|
- brief=(
|
|
- f"failed to install snap {snap.name!r} from store"
|
|
- f" channel {snap.channel!r} in target environment."
|
|
- ),
|
|
- details=error.details,
|
|
- resolution=(
|
|
- "Check Snap store status at https://status.snapcraft.io"
|
|
- ),
|
|
- ) from error
|
|
- else:
|
|
- try:
|
|
- snap_installer.inject_from_host(
|
|
- executor=executor,
|
|
- snap_name=snap.name,
|
|
- classic=snap.classic,
|
|
- )
|
|
- except SnapInstallationError as error:
|
|
- raise BaseConfigurationError(
|
|
- brief=(
|
|
- f"failed to inject host's snap {snap.name!r} "
|
|
- "into target environment."
|
|
- ),
|
|
- details=error.details,
|
|
- ) from error
|
|
+ try:
|
|
+ snap_installer.install_from_store(
|
|
+ executor=executor,
|
|
+ snap_name=snap.name,
|
|
+ channel=snap.channel,
|
|
+ classic=snap.classic,
|
|
+ )
|
|
+ except SnapInstallationError as error:
|
|
+ raise BaseConfigurationError(
|
|
+ brief=(
|
|
+ f"failed to install snap {snap.name!r} from store"
|
|
+ f" channel {snap.channel!r} in target environment."
|
|
+ ),
|
|
+ details=error.details,
|
|
+ resolution=(
|
|
+ "Check Snap store status at https://status.snapcraft.io"
|
|
+ ),
|
|
+ ) from error
|
|
|
|
def wait_until_ready(self, executor: Executor) -> None:
|
|
"""Wait until base instance is ready.
|