Updates based on review feedback

securedrop-app-code control file is now a template. We don't need --setuptools in rules file as by default virtualenv will install the latest setuptools.
freedomofpress · Aug 26, 2020 · 771ac3c · 771ac3c
1 parent 1b4f03b
commit 771ac3c
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 18 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
@@ -51,8 +51,6 @@ securedrop_python_version: "{{ '3.8' if securedrop_build_focal_support else '3.5
 securedrop_venv_site_packages: "{{ securedrop_venv }}/lib/python{{ securedrop_python_version }}/site-packages"
 
 securedrop_app_focal_files:
-  - src: control-focal
-    dest: "{{ securedrop_app_code_prep_dir }}/debian/control"
   - src: rules-focal
     dest: "{{ securedrop_app_code_prep_dir }}/debian/rules"
   - src: securedrop-app-code.triggers-focal

diff --git a/install_files/ansible-base/roles/build-securedrop-app-code-deb-pkg/files/control-focal b/install_files/ansible-base/roles/build-securedrop-app-code-deb-pkg/files/control-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
@@ -64,6 +64,11 @@
   with_items: "{{ securedrop_app_focal_files }}"
   when: securedrop_build_focal_support
 
+- name: Create the control file based on distribution
+  template:
+    src: "control.j2"
+    dest: "{{ securedrop_app_code_prep_dir }}/debian/control"
+
 - name: Create lib/systemd/services directory in prep directory
   file:
     state: directory

diff --git a/..._files/securedrop-app-code/debian/control → ...rop-app-code-deb-pkg/templates/control.j2 b/..._files/securedrop-app-code/debian/control → ...rop-app-code-deb-pkg/templates/control.j2
@@ -5,11 +5,14 @@ Maintainer: SecureDrop Team <[email protected]>
 Homepage: https://securedrop.org
 Build-Depends: debhelper (>= 9), dh-python, python3-all, python3-setuptools, dh-systemd, dh-virtualenv
 Standards-Version: 3.9.8
-X-Python3-Version: >= 3.5
 
 Package: securedrop-app-code
 Architecture: amd64
 Conflicts: libapache2-mod-wsgi,supervisor
 Replaces: libapache2-mod-wsgi,supervisor
+{% if securedrop_build_focal_support %}
+Depends: ${dist:Depends}, ${misc:Depends}, ${python3:Depends}, apache2, apparmor-utils, coreutils, gnupg2, haveged, libapache2-mod-xsendfile, libpython3.8, paxctld, python3, redis-server, securedrop-config, securedrop-keyring, sqlite3
+{% else %}
 Depends: ${dist:Depends}, ${misc:Depends}, ${python3:Depends}, apache2, apparmor-utils, coreutils, gnupg2, haveged, libapache2-mod-xsendfile, libpython3.5, paxctld, python3 (>= 3.5), python3 (<< 3.6), redis-server, securedrop-config, securedrop-keyring, sqlite3
+{% endif %}
 Description: SecureDrop application code, dependencies, Apache configuration, systemd services, and AppArmor profiles. This package will put the AppArmor profiles in enforce mode.