This is an automated email from the git hooks/post-receive script.

guillem pushed a commit to branch main
in repository dpkg.

View the commit online:
https://git.dpkg.org/cgit/dpkg/dpkg.git/commit/?id=ab4b58088a2427de235b27feae943558887f8e35

commit ab4b58088a2427de235b27feae943558887f8e35
Author: Guillem Jover <guil...@debian.org>
AuthorDate: Sun Jun 27 16:01:41 2021 +0200

    dselect: Honor DPKG_ADMINDIR environment variable
    
    Do not initialize admindir to the default, so that we can take into
    account any DPKG_ADMINDIR environment variable that might be set.
---
 dselect/main.cc | 2 +-
 man/dselect.pod | 5 +++++
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/dselect/main.cc b/dselect/main.cc
index dd3f4fb5f..9166c0393 100644
--- a/dselect/main.cc
+++ b/dselect/main.cc
@@ -63,7 +63,7 @@ static const char printforhelp[] = N_("Type dselect --help 
for help.");
 
 bool expertmode = false;
 
-static const char *admindir = ADMINDIR;
+static const char *admindir;
 
 static keybindings 
packagelistbindings(packagelist_kinterps,packagelist_korgbindings);
 
diff --git a/man/dselect.pod b/man/dselect.pod
index 9e15e88ff..2bc5471ed 100644
--- a/man/dselect.pod
+++ b/man/dselect.pod
@@ -622,6 +622,11 @@ memory allocations, etc.
 
 =over
 
+=item B<DPKG_ADMINDIR>
+
+If set and the B<--admindir> option has not been specified, it will
+be used as the B<dpkg> database directory (since dpkg 1.21.0).
+
 =item B<HOME>
 
 If set, B<dselect> will use it as the directory from which to read the

-- 
Dpkg.Org's dpkg

Reply via email to