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=6287a410289366649d2b5f45ce54066488f98a37 commit 6287a410289366649d2b5f45ce54066488f98a37 Author: Guillem Jover <[email protected]> AuthorDate: Wed Aug 6 18:07:46 2025 +0200 dpkg: Rename maintscript execution functions Prefix maintscript execution functions with «maintscript_run_», and then use «old» and «new» to refer to the installed and the currently being unpacked instances, to get more consistency, and to avoid confusing the previously named «maintscript_new» with some kind of constructor/allocator. Use _old_or_new instead of _fallback to make it more clear what the actual behavior is. Changelog: internal --- src/main/cleanup.c | 32 +++++++++---------- src/main/main.h | 14 +++++---- src/main/remove.c | 6 ++-- src/main/script.c | 24 +++++++-------- src/main/unpack.c | 90 +++++++++++++++++++++++++++--------------------------- 5 files changed, 84 insertions(+), 82 deletions(-) diff --git a/src/main/cleanup.c b/src/main/cleanup.c index a15fb759a..f4b1262bf 100644 --- a/src/main/cleanup.c +++ b/src/main/cleanup.c @@ -192,8 +192,8 @@ void cu_preinstverynew(int argc, void **argv) { char *cidirrest= (char*)argv[2]; if (cleanup_pkg_failed++) return; - maintscript_new(pkg, cidir, cidirrest, POSTRMFILE, - "abort-install", NULL); + maintscript_run_new(pkg, cidir, cidirrest, POSTRMFILE, + "abort-install", NULL); pkg_set_status(pkg, PKG_STAT_NOTINSTALLED); pkg_clear_eflags(pkg, PKG_EFLAG_REINSTREQ); pkgbin_blank(&pkg->installed); @@ -207,11 +207,11 @@ void cu_preinstnew(int argc, void **argv) { char *cidirrest= (char*)argv[2]; if (cleanup_pkg_failed++) return; - maintscript_new(pkg, cidir, cidirrest, POSTRMFILE, - "abort-install", - versiondescribe(&pkg->installed.version, vdew_nonambig), - versiondescribe(&pkg->available.version, vdew_nonambig), - NULL); + maintscript_run_new(pkg, cidir, cidirrest, POSTRMFILE, + "abort-install", + versiondescribe(&pkg->installed.version, vdew_nonambig), + versiondescribe(&pkg->available.version, vdew_nonambig), + NULL); pkg_set_status(pkg, PKG_STAT_CONFIGFILES); pkg_clear_eflags(pkg, PKG_EFLAG_REINSTREQ); modstatdb_note(pkg); @@ -225,11 +225,11 @@ void cu_preinstupgrade(int argc, void **argv) { enum pkgstatus *oldstatusp= (enum pkgstatus*)argv[3]; if (cleanup_pkg_failed++) return; - maintscript_new(pkg, cidir, cidirrest, POSTRMFILE, - "abort-upgrade", - versiondescribe(&pkg->installed.version, vdew_nonambig), - versiondescribe(&pkg->available.version, vdew_nonambig), - NULL); + maintscript_run_new(pkg, cidir, cidirrest, POSTRMFILE, + "abort-upgrade", + versiondescribe(&pkg->installed.version, vdew_nonambig), + versiondescribe(&pkg->available.version, vdew_nonambig), + NULL); pkg_set_status(pkg, *oldstatusp); pkg_clear_eflags(pkg, PKG_EFLAG_REINSTREQ); modstatdb_note(pkg); @@ -240,10 +240,10 @@ void cu_postrmupgrade(int argc, void **argv) { struct pkginfo *pkg= (struct pkginfo*)argv[0]; if (cleanup_pkg_failed++) return; - maintscript_installed(pkg, PREINSTFILE, - "abort-upgrade", - versiondescribe(&pkg->available.version, vdew_nonambig), - NULL); + maintscript_run_old(pkg, PREINSTFILE, + "abort-upgrade", + versiondescribe(&pkg->available.version, vdew_nonambig), + NULL); cleanup_pkg_failed--; } diff --git a/src/main/main.h b/src/main/main.h index 23dc42ec9..e27414863 100644 --- a/src/main/main.h +++ b/src/main/main.h @@ -239,16 +239,18 @@ namenodetouse(struct fsys_namenode *namenode, struct pkginfo *pkg, struct pkgbin *pkgbin); int -maintscript_installed(struct pkginfo *pkg, const char *scriptname, ...) +maintscript_run_old(struct pkginfo *pkg, const char *scriptname, ...) DPKG_ATTR_SENTINEL; -int maintscript_new(struct pkginfo *pkg, +int +maintscript_run_new(struct pkginfo *pkg, const char *cidir, char *cidirrest, const char *scriptname, ...) DPKG_ATTR_SENTINEL; -int maintscript_fallback(struct pkginfo *pkg, - const char *cidir, char *cidirrest, - const char *scriptname, - const char *ifok, const char *iffallback); +int +maintscript_run_old_or_new(struct pkginfo *pkg, + const char *cidir, char *cidirrest, + const char *scriptname, + const char *ifok, const char *iffallback); /* Callers wanting to run the postinst use these two as they want to postpone * trigger incorporation until after updating the package status. The effect diff --git a/src/main/remove.c b/src/main/remove.c index ec8c91ff9..b4cd5d086 100644 --- a/src/main/remove.c +++ b/src/main/remove.c @@ -196,7 +196,7 @@ void deferred_remove(struct pkginfo *pkg) { modstatdb_note(pkg); push_cleanup(cu_prermremove, ~ehflag_normaltidy, 2, (void *)pkg, (void *)&oldpkgstatus); - maintscript_installed(pkg, PRERMFILE, "remove", NULL); + maintscript_run_old(pkg, PRERMFILE, "remove", NULL); /* Will turn into ‘half-installed’ soon ... */ pkg_set_status(pkg, PKG_STAT_UNPACKED); @@ -361,7 +361,7 @@ removal_bulk_remove_files(struct pkginfo *pkg) ohshite(_("unable to securely remove '%.250s'"), fnvb.buf); } write_filelist_except(pkg, &pkg->installed, leftover, 0); - maintscript_installed(pkg, POSTRMFILE, "remove", NULL); + maintscript_run_old(pkg, POSTRMFILE, "remove", NULL); trig_parse_ci(pkg_infodb_get_file(pkg, &pkg->installed, TRIGGERSCIFILE), trig_cicb_interest_delete, NULL, pkg, &pkg->installed); @@ -611,7 +611,7 @@ static void removal_bulk_remove_configfiles(struct pkginfo *pkg) { pkg->installed.conffiles = NULL; modstatdb_note(pkg); - maintscript_installed(pkg, POSTRMFILE, "purge", NULL); + maintscript_run_old(pkg, POSTRMFILE, "purge", NULL); } /* diff --git a/src/main/script.c b/src/main/script.c index 7e5000f1e..45823c3ea 100644 --- a/src/main/script.c +++ b/src/main/script.c @@ -214,8 +214,8 @@ maintscript_exec(struct pkginfo *pkg, struct pkgbin *pkgbin, } static int -vmaintscript_installed(struct pkginfo *pkg, const char *scriptname, - va_list args) +vmaintscript_run_old(struct pkginfo *pkg, + const char *scriptname, va_list args) { struct command cmd; const char *scriptpath; @@ -253,13 +253,13 @@ vmaintscript_installed(struct pkginfo *pkg, const char *scriptname, */ int -maintscript_installed(struct pkginfo *pkg, const char *scriptname, ...) +maintscript_run_old(struct pkginfo *pkg, const char *scriptname, ...) { va_list args; int rc; va_start(args, scriptname); - rc = vmaintscript_installed(pkg, scriptname, args); + rc = vmaintscript_run_old(pkg, scriptname, args); va_end(args); if (rc) @@ -275,7 +275,7 @@ maintscript_postinst(struct pkginfo *pkg, ...) int rc; va_start(args, pkg); - rc = vmaintscript_installed(pkg, POSTINSTFILE, args); + rc = vmaintscript_run_old(pkg, POSTINSTFILE, args); va_end(args); if (rc) @@ -285,9 +285,9 @@ maintscript_postinst(struct pkginfo *pkg, ...) } int -maintscript_new(struct pkginfo *pkg, - const char *cidir, char *cidirrest, - const char *scriptname, ...) +maintscript_run_new(struct pkginfo *pkg, + const char *cidir, char *cidirrest, + const char *scriptname, ...) { struct command cmd; struct stat stab; @@ -325,10 +325,10 @@ maintscript_new(struct pkginfo *pkg, } int -maintscript_fallback(struct pkginfo *pkg, - const char *cidir, char *cidirrest, - const char *scriptname, - const char *ifok, const char *iffallback) +maintscript_run_old_or_new(struct pkginfo *pkg, + const char *cidir, char *cidirrest, + const char *scriptname, + const char *ifok, const char *iffallback) { struct command cmd; const char *oldscriptpath; diff --git a/src/main/unpack.c b/src/main/unpack.c index e729a4399..687fbe41e 100644 --- a/src/main/unpack.c +++ b/src/main/unpack.c @@ -308,23 +308,23 @@ pkg_deconfigure_others(struct pkginfo *pkg) 3, (void *)deconpil->pkg, (void *)removing, (void *)pkg); if (removing) { - maintscript_installed(deconpil->pkg, PRERMFILE, - "deconfigure", "in-favour", - pkgbin_name(pkg, &pkg->available, pnaw_nonambig), - versiondescribe(&pkg->available.version, - vdew_nonambig), - "removing", - pkg_name(removing, pnaw_nonambig), - versiondescribe(&removing->installed.version, - vdew_nonambig), - NULL); + maintscript_run_old(deconpil->pkg, PRERMFILE, + "deconfigure", "in-favour", + pkgbin_name(pkg, &pkg->available, pnaw_nonambig), + versiondescribe(&pkg->available.version, + vdew_nonambig), + "removing", + pkg_name(removing, pnaw_nonambig), + versiondescribe(&removing->installed.version, + vdew_nonambig), + NULL); } else { - maintscript_installed(deconpil->pkg, PRERMFILE, - "deconfigure", "in-favour", - pkgbin_name(pkg, &pkg->available, pnaw_nonambig), - versiondescribe(&pkg->available.version, - vdew_nonambig), - NULL); + maintscript_run_old(deconpil->pkg, PRERMFILE, + "deconfigure", "in-favour", + pkgbin_name(pkg, &pkg->available, pnaw_nonambig), + versiondescribe(&pkg->available.version, + vdew_nonambig), + NULL); } } } @@ -945,13 +945,13 @@ pkg_disappear(struct pkginfo *pkg, struct pkginfo *infavour) debug_at(dbg_general, "disappearing %s", pkg_name(pkg, pnaw_always)); trig_activate_packageprocessing(pkg); - maintscript_installed(pkg, POSTRMFILE, - "disappear", - pkgbin_name(infavour, &infavour->available, - pnaw_nonambig), - versiondescribe(&infavour->available.version, - vdew_nonambig), - NULL); + maintscript_run_old(pkg, POSTRMFILE, + "disappear", + pkgbin_name(infavour, &infavour->available, + pnaw_nonambig), + versiondescribe(&infavour->available.version, + vdew_nonambig), + NULL); /* OK, now we delete all the stuff in the ‘info’ directory ... */ debug_at(dbg_general, "cleaning info directory"); @@ -1383,8 +1383,8 @@ void process_archive(const char *filename) { pkg_set_status(pkg, PKG_STAT_HALFCONFIGURED); modstatdb_note(pkg); push_cleanup(cu_prermupgrade, ~ehflag_normaltidy, 1, (void *)pkg); - maintscript_fallback(pkg, cidir, cidirrest, PRERMFILE, - "upgrade", "failed-upgrade"); + maintscript_run_old_or_new(pkg, cidir, cidirrest, PRERMFILE, + "upgrade", "failed-upgrade"); pkg_set_status(pkg, PKG_STAT_UNPACKED); oldversionstatus = PKG_STAT_UNPACKED; modstatdb_note(pkg); @@ -1408,12 +1408,12 @@ void process_archive(const char *filename) { modstatdb_note(conflictor); push_cleanup(cu_prerminfavour, ~ehflag_normaltidy, 2, conflictor, pkg); - maintscript_installed(conflictor, PRERMFILE, - "remove", "in-favour", - pkgbin_name(pkg, &pkg->available, pnaw_nonambig), - versiondescribe(&pkg->available.version, - vdew_nonambig), - NULL); + maintscript_run_old(conflictor, PRERMFILE, + "remove", "in-favour", + pkgbin_name(pkg, &pkg->available, pnaw_nonambig), + versiondescribe(&pkg->available.version, + vdew_nonambig), + NULL); pkg_set_status(conflictor, PKG_STAT_HALFINSTALLED); modstatdb_note(conflictor); } @@ -1428,24 +1428,24 @@ void process_archive(const char *filename) { if (oldversionstatus == PKG_STAT_NOTINSTALLED) { push_cleanup(cu_preinstverynew, ~ehflag_normaltidy, 3,(void*)pkg,(void*)cidir,(void*)cidirrest); - maintscript_new(pkg, cidir, cidirrest, PREINSTFILE, - "install", NULL); + maintscript_run_new(pkg, cidir, cidirrest, PREINSTFILE, + "install", NULL); } else if (oldversionstatus == PKG_STAT_CONFIGFILES) { push_cleanup(cu_preinstnew, ~ehflag_normaltidy, 3,(void*)pkg,(void*)cidir,(void*)cidirrest); - maintscript_new(pkg, cidir, cidirrest, PREINSTFILE, - "install", - versiondescribe(&pkg->installed.version, vdew_nonambig), - versiondescribe(&pkg->available.version, vdew_nonambig), - NULL); + maintscript_run_new(pkg, cidir, cidirrest, PREINSTFILE, + "install", + versiondescribe(&pkg->installed.version, vdew_nonambig), + versiondescribe(&pkg->available.version, vdew_nonambig), + NULL); } else { push_cleanup(cu_preinstupgrade, ~ehflag_normaltidy, 4,(void*)pkg,(void*)cidir,(void*)cidirrest,(void*)&oldversionstatus); - maintscript_new(pkg, cidir, cidirrest, PREINSTFILE, - "upgrade", - versiondescribe(&pkg->installed.version, vdew_nonambig), - versiondescribe(&pkg->available.version, vdew_nonambig), - NULL); + maintscript_run_new(pkg, cidir, cidirrest, PREINSTFILE, + "upgrade", + versiondescribe(&pkg->installed.version, vdew_nonambig), + versiondescribe(&pkg->available.version, vdew_nonambig), + NULL); } if (oldversionstatus == PKG_STAT_NOTINSTALLED || @@ -1579,8 +1579,8 @@ void process_archive(const char *filename) { pkg_set_status(pkg, PKG_STAT_HALFINSTALLED); modstatdb_note(pkg); push_cleanup(cu_postrmupgrade, ~ehflag_normaltidy, 1, (void *)pkg); - maintscript_fallback(pkg, cidir, cidirrest, POSTRMFILE, - "upgrade", "failed-upgrade"); + maintscript_run_old_or_new(pkg, cidir, cidirrest, POSTRMFILE, + "upgrade", "failed-upgrade"); } /* If anything goes wrong while tidying up it's a bit late to do -- Dpkg.Org's dpkg
