Clone of https://github.com/NixOS/nixpkgs.git (to stress-test knotserver)
at r-updates 63 lines 2.6 kB view raw
1diff --git i/craft_providers/base.py w/craft_providers/base.py 2index 00f56ec..302f359 100644 3--- i/craft_providers/base.py 4+++ w/craft_providers/base.py 5@@ -655,40 +655,24 @@ class Base(ABC): 6 ), 7 ) 8 9- if snap.channel: 10- try: 11- snap_installer.install_from_store( 12- executor=executor, 13- snap_name=snap.name, 14- channel=snap.channel, 15- classic=snap.classic, 16- ) 17- except SnapInstallationError as error: 18- raise BaseConfigurationError( 19- brief=( 20- f"failed to install snap {snap.name!r} from store" 21- f" channel {snap.channel!r} in target environment." 22- ), 23- details=error.details, 24- resolution=( 25- "Check Snap store status at https://status.snapcraft.io" 26- ), 27- ) from error 28- else: 29- try: 30- snap_installer.inject_from_host( 31- executor=executor, 32- snap_name=snap.name, 33- classic=snap.classic, 34- ) 35- except SnapInstallationError as error: 36- raise BaseConfigurationError( 37- brief=( 38- f"failed to inject host's snap {snap.name!r} " 39- "into target environment." 40- ), 41- details=error.details, 42- ) from error 43+ try: 44+ snap_installer.install_from_store( 45+ executor=executor, 46+ snap_name=snap.name, 47+ channel=snap.channel, 48+ classic=snap.classic, 49+ ) 50+ except SnapInstallationError as error: 51+ raise BaseConfigurationError( 52+ brief=( 53+ f"failed to install snap {snap.name!r} from store" 54+ f" channel {snap.channel!r} in target environment." 55+ ), 56+ details=error.details, 57+ resolution=( 58+ "Check Snap store status at https://status.snapcraft.io" 59+ ), 60+ ) from error 61 62 def wait_until_ready(self, executor: Executor) -> None: 63 """Wait until base instance is ready.