summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorintrigeri <intrigeri@boum.org>2018-08-16 19:35:32 +0000
committerintrigeri <intrigeri@boum.org>2018-08-16 19:41:01 +0000
commit5f1cd1b98f6494be814ce1613158c778f2edcb9f (patch)
tree5f42e4bd8e7b3530217842e0eb66c8b1281c02d8
parent97d055451718ced620ccc9843020092b3acff0bb (diff)
Don't fail the build if the APT lists don't include any package whose name matches ^geoclue.3.9-rc1
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.
-rwxr-xr-xconfig/chroot_local-hooks/98-remove_unwanted_packages7
-rw-r--r--debian/changelog2
2 files changed, 8 insertions, 1 deletions
diff --git a/config/chroot_local-hooks/98-remove_unwanted_packages b/config/chroot_local-hooks/98-remove_unwanted_packages
index 13e2a0e..6f9628e 100755
--- a/config/chroot_local-hooks/98-remove_unwanted_packages
+++ b/config/chroot_local-hooks/98-remove_unwanted_packages
@@ -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
diff --git a/debian/changelog b/debian/changelog
index 486fb7f..c2d7439 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -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.