Skip to content

fix: remove unnecessary snapd_snap flag (#5316) #5689

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
mr-cal merged 1 commit into from
Aug 11, 2025
Merged

fix: remove unnecessary snapd_snap flag (#5316) #5689

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 0 additions & 12 deletions snapcraft_legacy/internal/build_providers/_snap.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -345,14 +345,6 @@ def _disable_and_wait_for_refreshes(self) -> None:
logger.debug("Waiting for pending snap auto refreshes.")
self._runner(["snap", "watch", "--last=auto-refresh?"], hide_output=True)

def _enable_snapd_snap(self) -> None:
# Required to not install the core snap when building using
# other bases.
logger.debug("Enable use of snapd snap.")
self._runner(
["snap", "set", "system", "experimental.snapd-snap=true"], hide_output=True
)

def _get_latest_revision(self, snap_name) -> Optional[str]:
try:
return self._registry_data[snap_name][-1]["revision"]
Expand Down Expand Up @@ -381,10 +373,6 @@ def apply(self) -> None:
if all((s.get_op() == _SnapOp.NOP for s in self._snaps)):
return

# Allow using snapd from the snapd snap to leverage newer snapd features.
if any(s.snap_instance_name == "snapd" for s in self._snaps):
self._enable_snapd_snap()

# Disable refreshes so they do not interfere with installation ops.
self._disable_and_wait_for_refreshes()

Expand Down
2 changes: 0 additions & 2 deletions tests/legacy/unit/build_providers/test_snap.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -123,7 +123,6 @@ def test_snapcraft_installed_on_host_from_store(self):
self.get_assertion_mock.assert_has_calls(get_assertion_calls)
self.provider.run_mock.assert_has_calls(
[
call(["snap", "set", "system", "experimental.snapd-snap=true"]),
call(["snap", "set", "system", ANY]),
call(["snap", "watch", "--last=auto-refresh?"]),
call(["snap", "ack", "/var/tmp/snapd.assert"]),
Expand Down Expand Up @@ -241,7 +240,6 @@ def test_snapcraft_installed_on_host_aliased_from_store(self):
self.get_assertion_mock.assert_has_calls(get_assertion_calls)
self.provider.run_mock.assert_has_calls(
[
call(["snap", "set", "system", "experimental.snapd-snap=true"]),
call(["snap", "set", "system", ANY]),
call(["snap", "watch", "--last=auto-refresh?"]),
call(["snap", "ack", "/var/tmp/snapd.assert"]),
Expand Down