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=2579adba0ddb239505dad5603c5274742d119b1d

commit 2579adba0ddb239505dad5603c5274742d119b1d
Author: Guillem Jover <[email protected]>
AuthorDate: Sun Nov 27 18:58:50 2022 +0100

    dpkg: Fix setting admindir when root is set
    
    We need to set the filesystem root directory before setting the database
    directory.
---
 src/main/main.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/main/main.c b/src/main/main.c
index a1b3c3f72..29d88bef6 100644
--- a/src/main/main.c
+++ b/src/main/main.c
@@ -200,7 +200,7 @@ int f_triggers = 0;
 
 int errabort = 50;
 static const char *admindir;
-const char *instdir= "";
+const char *instdir;
 struct pkg_list *ignoredependss = NULL;
 
 #define DBG_DEF(n, d) \
@@ -759,6 +759,7 @@ int main(int argc, const char *const *argv) {
 
   if (!cipaction) badusage(_("need an action option"));
 
+  instdir = dpkg_fsys_set_dir(instdir);
   admindir = dpkg_db_set_dir(admindir);
 
   /* Always set environment, to avoid possible security risks. */

-- 
Dpkg.Org's dpkg

Reply via email to