Merge pull request #6231 from freedomofpress/postinst-triggered

Don't register trigger on Python for securedrop-app-code package
freedomofpress · Jan 25, 2022 · 3810e85 · 3810e85
2 parents bb21088 + b64f7a0
commit 3810e85
Show file tree

Hide file tree

Showing 5 changed files with 1 addition and 26 deletions.
diff --git a/install_files/ansible-base/roles/build-securedrop-app-code-deb-pkg/defaults/main.yml b/install_files/ansible-base/roles/build-securedrop-app-code-deb-pkg/defaults/main.yml
@@ -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"
diff --git a/...ble-base/roles/build-securedrop-app-code-deb-pkg/files/securedrop-app-code.triggers-focal b/...ble-base/roles/build-securedrop-app-code-deb-pkg/files/securedrop-app-code.triggers-focal
diff --git a/install_files/ansible-base/roles/build-securedrop-app-code-deb-pkg/tasks/main.yml b/install_files/ansible-base/roles/build-securedrop-app-code-deb-pkg/tasks/main.yml
@@ -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"

diff --git a/install_files/securedrop-app-code/debian/postinst b/install_files/securedrop-app-code/debian/postinst
@@ -243,7 +243,7 @@ case "$1" in
 
     ;;
 
-    abort-upgrade|abort-remove|abort-deconfigure)
+    abort-upgrade|abort-remove|abort-deconfigure|triggered)
     ;;
 
     *)

diff --git a/install_files/securedrop-app-code/debian/securedrop-app-code.triggers b/install_files/securedrop-app-code/debian/securedrop-app-code.triggers
-Original file 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 @@