Skip to content
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.

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

libstore: check additionalSandboxProfile #10652

Merged
merged 1 commit into from May 6, 2024

Conversation

thufschmitt
Copy link
Member

Motivation

Make sure that extraSandboxProfile is set before we check whether it's
empty or not (in the sandbox=true case).

Also adds a test case for this.

Co-Authored-By: Artemis Tosini lix@artem.ist

Original code from https://git.lix.systems/lix-project/lix/commit/ecdbc3b207eaec1a2cafd2a0d494bcbabdd60a11, fixed and tested for upstream integration.

Priorities and Process

Add 👍 to pull requests you find important.

The Nix maintainer team uses a GitHub project board to schedule and track reviews.

@github-actions github-actions bot added the with-tests Issues related to testing. PRs with tests have some priority label May 6, 2024
@thufschmitt thufschmitt force-pushed the check-additionalSandboxProfile branch from 50eab74 to deef8b6 Compare May 6, 2024 15:15
@thufschmitt thufschmitt requested a review from edolstra May 6, 2024 15:16
@edolstra edolstra enabled auto-merge May 6, 2024 15:34
Make sure that `extraSandboxProfile` is set before we check whether it's
empty or not (in the `sandbox=true` case).

Also adds a test case for this.

Co-Authored-By: Artemis Tosini <lix@artem.ist>
Co-Authored-By: Eelco Dolstra <edolstra@gmail.com>
@thufschmitt thufschmitt force-pushed the check-additionalSandboxProfile branch from deef8b6 to 9bd1191 Compare May 6, 2024 15:37
@edolstra edolstra merged commit 2926ef0 into NixOS:master May 6, 2024
9 checks passed
@thufschmitt thufschmitt added the backport 2.18-maintenance Automatically creates a PR against the branch label May 10, 2024
Copy link

Backport failed for 2.18-maintenance, because it was unable to cherry-pick the commit(s).

Please cherry-pick the changes locally and resolve any conflicts.

git fetch origin 2.18-maintenance
git worktree add -d .worktree/backport-10652-to-2.18-maintenance origin/2.18-maintenance
cd .worktree/backport-10652-to-2.18-maintenance
git switch --create backport-10652-to-2.18-maintenance
git cherry-pick -x 9bd1191fccb80a895af976e2445fb92167d9d2f1

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
backport 2.18-maintenance Automatically creates a PR against the branch with-tests Issues related to testing. PRs with tests have some priority
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

2 participants