summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authoranonym <anonym@riseup.net>2019-01-19 13:22:51 +0100
committeranonym <anonym@riseup.net>2019-01-19 13:22:51 +0100
commit02697edc52edb9d4cecc796135014dcca7aa0f3d (patch)
treea379aa2daaac0811a164e95a6f032bd5ca51417b
parent4a41f4678980d614d8a1451b76352f04c96c0e8b (diff)
Don't reference packages that we _never_ install.3.12-rc1
That fails when we use tagged snapshots, since such packages doesn't exist which makes apt-get bail out. I'd rather remove the affected apt-get call, but I wonder if that could have consequences, so I'll open a ticket about what to do instead.
-rwxr-xr-xconfig/chroot_local-hooks/98-remove_unwanted_packages8
1 files changed, 6 insertions, 2 deletions
diff --git a/config/chroot_local-hooks/98-remove_unwanted_packages b/config/chroot_local-hooks/98-remove_unwanted_packages
index c1906c1..8a7d5fa 100755
--- a/config/chroot_local-hooks/98-remove_unwanted_packages
+++ b/config/chroot_local-hooks/98-remove_unwanted_packages
@@ -2,6 +2,9 @@
set -e
+# Import is_package_installed
+. /usr/local/lib/tails-shell-library/common.sh
+
echo "Removing unwanted packages"
### Deinstall dev packages.
@@ -45,8 +48,9 @@ apt-get --yes purge \
### Remove packages that can get a different priority in the security
### archive (see https://bugs.debian.org/867668):
-apt-get --yes purge \
- mutt
+if package_is_installed mutt; then
+ apt-get --yes purge mutt
+fi
### Deinstall some other unwanted packages.
apt-get --yes purge \