Remove Tails 3 Python 3 venv in Tails 4 #4914
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
emkll
requested review from
heartsucker,
kushaldas and
redshiftzero
as code owners
admin/bootstrap.py
Outdated
| @@ -75,6 +76,34 @@ def is_tails(): | |||
| return id == 'Tails' | |||
|
|
|||
|
|
|||
| def clean_up_tails3_venv(VENV_DIR): | |||
There was a problem hiding this comment.
heads up best to replace def clean_up_tails3_venv(VENV_DIR) with def clean_up_tails3_venv(virtualenv_path=VENV_DIR) and use virtualenv_path within the function. otherwise there are going to be two VENV_DIR variables with different scopes (one global, one local) - this will work as python's scope resolution will select the local first but this could cause confusion in the future
Adds a "checkenv" argument to admin/bootstrap.py, used in securedrop-admin to ensure that the admin virtualenv is functional. Also make sure bootstrap.py runs under Python 3.
|
Changes introduced by @rmol look good to me, since i opened the PR and have authored some commits, I cannot formally review. Could someone else please review this? |
kushaldas
approved these changes
Oct 17, 2019
There was a problem hiding this comment.
Starting from a Tails 3.16 drive with securedrop repo cloned:
- Check out 1.1.0-rc2 tag
./securedrop-admin setup- Python 3 venv is present in ~/persistent/securedrop/admin/.venv3
- Upgrade Tails drive to Tails 4.0-rc1
- Run
./securedrop-admin setup - Observe failure described in securedrop-admin (setup) fails in Tails 4.0-rc1 #4910
- Check out this branch
- Run
./securedrop-admin - The venv should be deleted and you should be prompted to run
./securedrop-admin setup - Run
./securedrop-admin setup - Venv is recreated under Tails 4.0,
./securedrop-adminnow works
emkll
added a commit
that referenced
this pull request
Oct 17, 2019
[1.1.0] Backport of #4914 Remove Tails 3 Python 3 venv in Tails 4
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Status
Ready for review
Description of Changes
Closes #4910
Testing
Starting from a Tails 3.16 drive with securedrop repo cloned:
./securedrop-admin setup./securedrop-admin setup./securedrop-admin./securedrop-admin setup./securedrop-admin setup./securedrop-adminnow worksDeployment
Admins upgrading both admin and journalist (if
./securedrop-admin tailsconfigis needed, for example when migrating to v3 onions) workstations will need to run./securedrop-admin setupafter upgrading their workstations to Tails 4.0. The user should now be prompted to do so when they run any./securedrop-admincommandChecklist
If you made changes to
securedrop-admin:make -C admin test) pass in the admin development containerIf you made non-trivial code changes: