diff options
| author | Julian Andres Klode <jak@debian.org> | 2022-10-28 18:33:23 +0000 |
|---|---|---|
| committer | Julian Andres Klode <jak@debian.org> | 2022-10-28 18:33:23 +0000 |
| commit | 4853fc78fef28ddb3718dae966cc0d0c9685a8dd (patch) | |
| tree | 87ab2dba9c541043ce1134f5327d808f5ba4ef22 | |
| parent | 331b592e70ddf352db694a987c5651703b0d2a94 (diff) | |
| parent | f6954267f5df0a8a7f8c3f97033f121297d869a5 (diff) | |
Merge branch 'adduser' into 'main'
since base-passwd 3.6.1 the _apt user is in the default /etc/passwd, so we can...
See merge request apt-team/apt!260
| -rwxr-xr-x | debian/apt.postinst | 2 | ||||
| -rw-r--r-- | debian/control | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/debian/apt.postinst b/debian/apt.postinst index 8a623f2fd..54a0770b7 100755 --- a/debian/apt.postinst +++ b/debian/apt.postinst @@ -1,7 +1,7 @@ #! /bin/sh set -e -if [ "$1" = 'configure' ]; then +if [ "$1" = 'configure' ] && [ -z "$DPKG_ROOT" ] && ! getent passwd _apt >/dev/null; then # add unprivileged user for the apt methods adduser --force-badname --system --home /nonexistent \ --no-create-home --quiet _apt || true diff --git a/debian/control b/debian/control index 58c6be15e..5768d7301 100644 --- a/debian/control +++ b/debian/control @@ -37,7 +37,7 @@ Vcs-Browser: https://salsa.debian.org/apt-team/apt Package: apt Architecture: any -Depends: adduser, +Depends: base-passwd (>= 3.6.1) | adduser, gpgv | gpgv2 | gpgv1, libapt-pkg6.0 (>= ${binary:Version}), ${apt:keyring}, |