Commit 5f1cd1b9 authored by intrigeri's avatar intrigeri

Don't fail the build if the APT lists don't include any package whose name matches ^geoclue.

The build of my first tentative 3.9~rc1 ISO failed with:

 E: Unable to locate package ^geoclue*
 E: Couldn't find any package by glob '^geoclue*'
 E: Couldn't find any package by regex '^geoclue*'
 E: config/chroot_local-hooks/98-remove_unwanted_packages failed (exit non-zero). You should check for errors.

That's because the partial, tagged APT snapshot used to build this ISO don't
include any package whose name matches ^geoclue. So let's only attempt to remove
such packages if at least one of them is installed.
parent 97d05545
......@@ -46,7 +46,6 @@ apt-get --yes purge \
### Deinstall some other unwanted packages.
apt-get --yes purge \
'^aptitude*' \
'^geoclue*' \
krb5-locales \
libdvdcss2-dbgsym \
live-build \
......@@ -56,5 +55,11 @@ apt-get --yes purge \
tasksel-data \
tcpd
### Deinstall some other unwanted packages whose regexp might not be match
### anything when building with partial, tagged APT snapshots.
if [ $(dpkg --get-selections | grep -c -E '^geoclue') -gt 0 ]; then
apt-get --yes purge '^geoclue*'
fi
### Deinstall dependencies of the just removed packages.
apt-get --yes --purge autoremove
......@@ -103,6 +103,8 @@ tails (3.9~rc1) unstable; urgency=medium
Such changes can break Tails after an automatic upgrade was applied
so let's detect it ASAP. Consequently, ensure a few GIDs that wanted
to play musical chairs are the same as in Tails 3.8 (Closes: #15695).
- Don't fail the build if the APT lists don't include any package
whose name matches ^geoclue.
* Test suite
- Adjust to the new tails-persistence-setup API.
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment