Merge branch 'drybjed-python-package-changes'

debops · Aug 29, 2023 · 53e5d44 · 53e5d44
2 parents 9791f4d + 46b2921
commit 53e5d44
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 4 deletions.
diff --git a/ansible/roles/apt/defaults/main.yml b/ansible/roles/apt/defaults/main.yml
@@ -220,7 +220,7 @@ apt__host_repositories: []
                                                                    # ]]]
                                                                    # ]]]
 # APT deb822 repositories [[[
-# --------------------
+# ---------------------------
 
 # These lists define additional APT repositories in deb822 format
 # :file:`/etc/apt/sources.list.d/` directory.

diff --git a/ansible/roles/preseed/defaults/main.yml b/ansible/roles/preseed/defaults/main.yml
@@ -101,7 +101,7 @@ preseed__debian_postinst_commands: ''
 # List of APT packages to install on the preseeded host, included in all
 # Preseed flavors using the ``pkgsel/include`` Preseed option.
 preseed__debian_packages: [ 'python3', 'python3-apt', 'python3-pip',
-                            'lsb-release', 'git', 'curl' ]
+                            'python3-debian', 'lsb-release', 'git', 'curl' ]
 
                                                                    # ]]]
 # .. envvar:: preseed__debian_kernel_arguments [[[

diff --git a/ansible/roles/python/defaults/main.yml b/ansible/roles/python/defaults/main.yml
@@ -50,6 +50,7 @@ python__v3: True
 python__core_packages3:
   - 'python3'
   - 'python3-apt'
+  - 'python3-debian'
 
                                                                    # ]]]
 # .. envvar:: python__base_packages3 [[[
@@ -132,7 +133,7 @@ python__v2: '{{ ansible_local.python.installed2
 # installed in the "raw" mode as well as during normal role operation.
 python__core_packages2:
   - 'python'
-  - 'python-apt'
+  - 'python-apt-common'
 
                                                                    # ]]]
 # .. envvar:: python__base_packages2 [[[

diff --git a/lib/ansible-galaxy/make-collection b/lib/ansible-galaxy/make-collection
@@ -105,7 +105,7 @@ for role in "${!debops_role_map[@]}" ; do
     if [ -f "ansible/playbooks/service/${role}.yml" ] ; then
         read -r -a dependencies_in_playbooks <<<"$(git grep -h --word-regexp -e "role::.*" \
                                                             --and --not -e "role::${role}" \
-                                                            ansible/playbooks/service/${role}.yml \
+                                                            "ansible/playbooks/service/${role}.yml" \
                                                    | sed -e "s/^.*role:://" -e "s/'.*$//" \
                                                    | tr '\n' ' ')" || true
         if [ -n "${dependencies_in_playbooks[*]+x}" ] ; then