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=df19d205e23c763e46cdeb59d16a020ad04981a1 commit df19d205e23c763e46cdeb59d16a020ad04981a1 Author: Guillem Jover <[email protected]> AuthorDate: Sat Jun 26 23:07:06 2021 +0200 dpkg-divert, dpkg-statoverride: Set admindir after instdir When initializing the instdir and the admindir, we need to set instdir first, otherwise admindir will not be set relative to instdir in case it needs to be set to its default value. --- src/divertcmd.c | 2 +- src/statcmd.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/divertcmd.c b/src/divertcmd.c index 5095e2b0a..dae3ba227 100644 --- a/src/divertcmd.c +++ b/src/divertcmd.c @@ -852,8 +852,8 @@ main(int argc, const char * const *argv) dpkg_program_init("dpkg-divert"); dpkg_options_parse(&argv, cmdinfos, printforhelp); - admindir = dpkg_db_set_dir(admindir); instdir = dpkg_fsys_set_dir(instdir); + admindir = dpkg_db_set_dir(admindir); env_pkgname = getenv("DPKG_MAINTSCRIPT_PACKAGE"); if (opt_pkgname_match_any && env_pkgname) diff --git a/src/statcmd.c b/src/statcmd.c index 6ffc95172..1b3c998d4 100644 --- a/src/statcmd.c +++ b/src/statcmd.c @@ -411,8 +411,8 @@ main(int argc, const char *const *argv) set_force_default(FORCE_STATCMD_MASK); dpkg_options_parse(&argv, cmdinfos, printforhelp); - admindir = dpkg_db_set_dir(admindir); instdir = dpkg_fsys_set_dir(instdir); + admindir = dpkg_db_set_dir(admindir); if (!cipaction) badusage(_("need an action option")); -- Dpkg.Org's dpkg
