fix: remove unnecessary snapd_snap flag (#5689)

Fixes #5316

Author: steinbro

snapcraft_legacy/internal/build_providers/_snap.py

@@ -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"]
@@ -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()
 

tests/legacy/unit/build_providers/test_snap.py

@@ -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"]),
@@ -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"]),