From: Julian Andres Klode <jak@debian.org>
Date: Thu, 20 Aug 2015 12:47:32 +0000 (+0200)
Subject: postinst: Correctly pass --home instead of -home, and fixup old user
X-Git-Tag: 1.1.exp10~3
X-Git-Url: https://git.saurik.com/apt.git/commitdiff_plain/269b7c0cd89e9508c0051d6ac2c3632540a31daa

postinst: Correctly pass --home instead of -home, and fixup old user

Thanks: Niels Thykier for reporting this on IRC
---

diff --git a/debian/apt.postinst b/debian/apt.postinst
index b0a5da7d8..1f98fcece 100755
--- a/debian/apt.postinst
+++ b/debian/apt.postinst
@@ -40,9 +40,14 @@ case "$1" in
 	fi
 
 	# add unprivileged user for the apt methods
-	adduser --force-badname --system -home /var/empty \
+	adduser --force-badname --system --home /nonexistent  \
 	    --no-create-home --quiet _apt || true
 
+	# Fixup any mistake in the home directory of the _apt user
+	if dpkg --compare-versions "$2" lt-nl 1.1~exp10~; then
+	    usermod --home /nonexistent _apt
+	fi
+
 	# deal with upgrades from experimental
 	if dpkg --compare-versions "$2" 'eq' '1.1~exp3'; then
 	    # libapt will setup partial/ at runtime