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

Don't register trigger on Python for securedrop-app-code package #6231

Merged
merged 1 commit into from
Jan 25, 2022
Merged

Don't register trigger on Python for securedrop-app-code package #6231

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
4 changes: 0 additions & 4 deletions install_files/ansible-base/roles/build-securedrop-app-code-deb-pkg/defaults/main.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,3 @@ securedrop_venv: "/opt/venvs/securedrop-app-code"
securedrop_venv_bin: "{{ securedrop_venv }}/bin"
securedrop_python_version: "{{ '3.8' if securedrop_target_distribution == 'focal' else '3.5' }}"
securedrop_venv_site_packages: "{{ securedrop_venv }}/lib/python{{ securedrop_python_version }}/site-packages"

securedrop_app_focal_files:
- src: securedrop-app-code.triggers-focal
dest: "{{ securedrop_app_code_prep_dir }}/debian/securedrop-app-code.triggers"
7 changes: 0 additions & 7 deletions ...ble-base/roles/build-securedrop-app-code-deb-pkg/files/securedrop-app-code.triggers-focal
View file
Open in desktop

This file was deleted.

7 changes: 0 additions & 7 deletions install_files/ansible-base/roles/build-securedrop-app-code-deb-pkg/tasks/main.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,13 +60,6 @@
src: "changelog-{{ securedrop_target_distribution }}"
dest: "{{ securedrop_app_code_prep_dir }}/debian/changelog"

- name: Replace the files required for focal package
copy:
src: "{{ item.src }}"
dest: "{{ item.dest }}"
with_items: "{{ securedrop_app_focal_files }}"
when: securedrop_target_distribution == "focal"

- name: Create the control file based on distribution
template:
src: "control.j2"
Expand Down
2 changes: 1 addition & 1 deletion install_files/securedrop-app-code/debian/postinst
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -243,7 +243,7 @@ case "$1" in

;;

abort-upgrade|abort-remove|abort-deconfigure)
abort-upgrade|abort-remove|abort-deconfigure|triggered)
;;

*)
Expand Down
7 changes: 0 additions & 7 deletions install_files/securedrop-app-code/debian/securedrop-app-code.triggers
View file
Open in desktop

This file was deleted.