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.

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

Jump to bottom

snapcraft: fix probert, add curtin runners #1747

Merged
merged 1 commit into from
Aug 2, 2023
Merged

snapcraft: fix probert, add curtin runners #1747

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.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
3 changes: 1 addition & 2 deletions bin/subiquity-cmd
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
#!/bin/sh

export PYTHONPATH=$PYTHONPATH:$SNAP/lib/python3.10/site-packages
$PYTHON -m subiquity "$@"
exec "$@"
dbungert marked this conversation as resolved.
Show resolved Hide resolved
13 changes: 11 additions & 2 deletions snapcraft.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ contact: https://bugs.launchpad.net/subiquity/+filebug

apps:
subiquity:
command: usr/bin/subiquity-cmd
command: usr/bin/subiquity-cmd $SNAP/usr/bin/python3.10 -m subiquity
environment:
# Save original values of environment variables, we want to restore them
# for the debug shell (LP: #1975629) and restart (LP: #1978139)
Expand All @@ -23,7 +23,16 @@ apps:
PYTHON_ORIG: $PYTHON
PYTHON: $SNAP/usr/bin/python3.10
probert:
command: bin/probert
command: usr/bin/subiquity-cmd $SNAP/usr/bin/python3.10 $SNAP/bin/probert
environment:
PYTHON: $SNAP/usr/bin/python3.10
curtin:
command: usr/bin/subiquity-cmd $SNAP/bin/curtin
environment:
PYTHONIOENCODING: utf-8
PYTHON: $SNAP/usr/bin/python3.10
PY3OR2_PYTHON: $SNAP/usr/bin/python3.10
PATH: $PATH:$SNAP/bin
subiquity-server:
command: usr/bin/subiquity-server
daemon: simple
Expand Down