Skip to content

sandbox: Do not silently drop platform properties #2013

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
juergbi merged 1 commit into from
May 23, 2025
Merged

sandbox: Do not silently drop platform properties #2013

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
3 changes: 0 additions & 3 deletions src/buildstream/sandbox/_sandboxbuildboxrun.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -238,6 +238,3 @@ def resume_proc():

if returncode != 0:
raise SandboxError("buildbox-run failed with returncode {}".format(returncode))

def _supported_platform_properties(self):
return {"OSFamily", "ISA", "unixUID", "unixGID", "network"}
7 changes: 0 additions & 7 deletions src/buildstream/sandbox/_sandboxreapi.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -131,10 +131,6 @@ def _create_platform(self, flags):
if flags & _SandboxFlags.NETWORK_ENABLED:
platform_dict["network"] = "on"

# Remove unsupported platform properties from the dict
supported_properties = self._supported_platform_properties()
platform_dict = {key: value for (key, value) in platform_dict.items() if key in supported_properties}

# Create Platform message with properties sorted by name in code point order
platform = remote_execution_pb2.Platform()
for key, value in sorted(platform_dict.items()):
Expand Down Expand Up @@ -203,9 +199,6 @@ def _create_batch(self, main_group, flags, *, collect=None):
def _execute_action(self, action, flags):
raise ImplError("Sandbox of type '{}' does not implement _execute_action()".format(type(self).__name__))

def _supported_platform_properties(self):
return {"OSFamily", "ISA"}


# _SandboxREAPIBatch()
#
Expand Down
Loading