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=6e41b73c8470ab01f0fd2b8055d738100bb5f73d commit 6e41b73c8470ab01f0fd2b8055d738100bb5f73d Author: Guillem Jover <[email protected]> AuthorDate: Fri Jul 25 03:36:49 2025 +0200 dpkg: Use maintscript name instead of untranslated description in error messages Do not use a descriptive name for the maintainer scripts, which was currently not marked for translation and seems more confusing. The only case where this might have mattered was to distinguish maintscripts for the disappearing case, but it does not look necessary as we are already printing a notice before running them. Instead use the actual maintscript name, which is what people are going to be more familiar with, and requires no mental mapping to the actual filename in the «.deb» or within the source package. --- src/main/cleanup.c | 8 ++++---- src/main/main.h | 9 +++++---- src/main/remove.c | 6 +++--- src/main/script.c | 23 +++++++++++------------ src/main/unpack.c | 17 ++++++++--------- 5 files changed, 31 insertions(+), 32 deletions(-) diff --git a/src/main/cleanup.c b/src/main/cleanup.c index 0f7d6ff92..bbdea22ec 100644 --- a/src/main/cleanup.c +++ b/src/main/cleanup.c @@ -193,7 +193,7 @@ void cu_preinstverynew(int argc, void **argv) { char *cidirrest= (char*)argv[2]; if (cleanup_pkg_failed++) return; - maintscript_new(pkg, POSTRMFILE, "post-removal", cidir, cidirrest, + maintscript_new(pkg, POSTRMFILE, cidir, cidirrest, "abort-install", NULL); pkg_set_status(pkg, PKG_STAT_NOTINSTALLED); pkg_clear_eflags(pkg, PKG_EFLAG_REINSTREQ); @@ -208,7 +208,7 @@ void cu_preinstnew(int argc, void **argv) { char *cidirrest= (char*)argv[2]; if (cleanup_pkg_failed++) return; - maintscript_new(pkg, POSTRMFILE, "post-removal", cidir, cidirrest, + maintscript_new(pkg, POSTRMFILE, cidir, cidirrest, "abort-install", versiondescribe(&pkg->installed.version, vdew_nonambig), versiondescribe(&pkg->available.version, vdew_nonambig), @@ -226,7 +226,7 @@ void cu_preinstupgrade(int argc, void **argv) { enum pkgstatus *oldstatusp= (enum pkgstatus*)argv[3]; if (cleanup_pkg_failed++) return; - maintscript_new(pkg, POSTRMFILE, "post-removal", cidir, cidirrest, + maintscript_new(pkg, POSTRMFILE, cidir, cidirrest, "abort-upgrade", versiondescribe(&pkg->installed.version, vdew_nonambig), versiondescribe(&pkg->available.version, vdew_nonambig), @@ -241,7 +241,7 @@ void cu_postrmupgrade(int argc, void **argv) { struct pkginfo *pkg= (struct pkginfo*)argv[0]; if (cleanup_pkg_failed++) return; - maintscript_installed(pkg, PREINSTFILE, "pre-installation", + maintscript_installed(pkg, PREINSTFILE, "abort-upgrade", versiondescribe(&pkg->available.version, vdew_nonambig), NULL); diff --git a/src/main/main.h b/src/main/main.h index 9738ead8d..454edebfc 100644 --- a/src/main/main.h +++ b/src/main/main.h @@ -238,14 +238,15 @@ struct fsys_namenode * namenodetouse(struct fsys_namenode *namenode, struct pkginfo *pkg, struct pkgbin *pkgbin); -int maintscript_installed(struct pkginfo *pkg, const char *scriptname, - const char *desc, ...) DPKG_ATTR_SENTINEL; +int +maintscript_installed(struct pkginfo *pkg, const char *scriptname, ...) + DPKG_ATTR_SENTINEL; int maintscript_new(struct pkginfo *pkg, - const char *scriptname, const char *desc, + const char *scriptname, const char *cidir, char *cidirrest, ...) DPKG_ATTR_SENTINEL; int maintscript_fallback(struct pkginfo *pkg, - const char *scriptname, const char *desc, + const char *scriptname, const char *cidir, char *cidirrest, const char *ifok, const char *iffallback); diff --git a/src/main/remove.c b/src/main/remove.c index 29083427e..deb83de94 100644 --- a/src/main/remove.c +++ b/src/main/remove.c @@ -197,7 +197,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, "pre-removal", "remove", NULL); + maintscript_installed(pkg, PRERMFILE, "remove", NULL); /* Will turn into ‘half-installed’ soon ... */ pkg_set_status(pkg, PKG_STAT_UNPACKED); @@ -364,7 +364,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, "post-removal", "remove", NULL); + maintscript_installed(pkg, POSTRMFILE, "remove", NULL); trig_parse_ci(pkg_infodb_get_file(pkg, &pkg->installed, TRIGGERSCIFILE), trig_cicb_interest_delete, NULL, pkg, &pkg->installed); @@ -614,7 +614,7 @@ static void removal_bulk_remove_configfiles(struct pkginfo *pkg) { pkg->installed.conffiles = NULL; modstatdb_note(pkg); - maintscript_installed(pkg, POSTRMFILE, "post-removal", "purge", NULL); + maintscript_installed(pkg, POSTRMFILE, "purge", NULL); } /* diff --git a/src/main/script.c b/src/main/script.c index ac4e01347..b2bfd3889 100644 --- a/src/main/script.c +++ b/src/main/script.c @@ -215,7 +215,7 @@ maintscript_exec(struct pkginfo *pkg, struct pkgbin *pkgbin, static int vmaintscript_installed(struct pkginfo *pkg, const char *scriptname, - const char *desc, va_list args) + va_list args) { struct command cmd; const char *scriptpath; @@ -224,7 +224,7 @@ vmaintscript_installed(struct pkginfo *pkg, const char *scriptname, scriptpath = pkg_infodb_get_file(pkg, &pkg->installed, scriptname); buf = str_fmt(_("installed %s package %s script"), - pkg_name(pkg, pnaw_nonambig), desc); + pkg_name(pkg, pnaw_nonambig), scriptname); command_init(&cmd, scriptpath, buf); command_add_arg(&cmd, scriptname); @@ -255,14 +255,13 @@ vmaintscript_installed(struct pkginfo *pkg, const char *scriptname, */ int -maintscript_installed(struct pkginfo *pkg, const char *scriptname, - const char *desc, ...) +maintscript_installed(struct pkginfo *pkg, const char *scriptname, ...) { va_list args; int rc; - va_start(args, desc); - rc = vmaintscript_installed(pkg, scriptname, desc, args); + va_start(args, scriptname); + rc = vmaintscript_installed(pkg, scriptname, args); va_end(args); if (rc) @@ -278,7 +277,7 @@ maintscript_postinst(struct pkginfo *pkg, ...) int rc; va_start(args, pkg); - rc = vmaintscript_installed(pkg, POSTINSTFILE, "post-installation", args); + rc = vmaintscript_installed(pkg, POSTINSTFILE, args); va_end(args); if (rc) @@ -289,7 +288,7 @@ maintscript_postinst(struct pkginfo *pkg, ...) int maintscript_new(struct pkginfo *pkg, const char *scriptname, - const char *desc, const char *cidir, char *cidirrest, ...) + const char *cidir, char *cidirrest, ...) { struct command cmd; struct stat stab; @@ -298,7 +297,7 @@ maintscript_new(struct pkginfo *pkg, const char *scriptname, strcpy(cidirrest, scriptname); buf = str_fmt(_("new %s package %s script"), - pkg_name(pkg, pnaw_nonambig), desc); + pkg_name(pkg, pnaw_nonambig), scriptname); va_start(args, cidirrest); command_init(&cmd, cidir, buf); @@ -329,7 +328,7 @@ maintscript_new(struct pkginfo *pkg, const char *scriptname, int maintscript_fallback(struct pkginfo *pkg, - const char *scriptname, const char *desc, + const char *scriptname, const char *cidir, char *cidirrest, const char *ifok, const char *iffallback) { @@ -340,7 +339,7 @@ maintscript_fallback(struct pkginfo *pkg, oldscriptpath = pkg_infodb_get_file(pkg, &pkg->installed, scriptname); buf = str_fmt(_("old %s package %s script"), - pkg_name(pkg, pnaw_nonambig), desc); + pkg_name(pkg, pnaw_nonambig), scriptname); command_init(&cmd, oldscriptpath, buf); command_add_args(&cmd, scriptname, ifok, @@ -371,7 +370,7 @@ maintscript_fallback(struct pkginfo *pkg, strcpy(cidirrest, scriptname); buf = str_fmt(_("new %s package %s script"), - pkg_name(pkg, pnaw_nonambig), desc); + pkg_name(pkg, pnaw_nonambig), scriptname); command_init(&cmd, cidir, buf); command_add_args(&cmd, scriptname, iffallback, diff --git a/src/main/unpack.c b/src/main/unpack.c index c0ca48b30..83fd0c0df 100644 --- a/src/main/unpack.c +++ b/src/main/unpack.c @@ -305,7 +305,7 @@ pkg_deconfigure_others(struct pkginfo *pkg) 3, (void *)deconpil->pkg, (void *)removing, (void *)pkg); if (removing) { - maintscript_installed(deconpil->pkg, PRERMFILE, "pre-removal", + maintscript_installed(deconpil->pkg, PRERMFILE, "deconfigure", "in-favour", pkgbin_name(pkg, &pkg->available, pnaw_nonambig), versiondescribe(&pkg->available.version, @@ -316,7 +316,7 @@ pkg_deconfigure_others(struct pkginfo *pkg) vdew_nonambig), NULL); } else { - maintscript_installed(deconpil->pkg, PRERMFILE, "pre-removal", + maintscript_installed(deconpil->pkg, PRERMFILE, "deconfigure", "in-favour", pkgbin_name(pkg, &pkg->available, pnaw_nonambig), versiondescribe(&pkg->available.version, @@ -944,7 +944,6 @@ pkg_disappear(struct pkginfo *pkg, struct pkginfo *infavour) trig_activate_packageprocessing(pkg); maintscript_installed(pkg, POSTRMFILE, - "post-removal script (for disappearance)", "disappear", pkgbin_name(infavour, &infavour->available, pnaw_nonambig), @@ -1384,7 +1383,7 @@ 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, PRERMFILE, "pre-removal", cidir, cidirrest, + maintscript_fallback(pkg, PRERMFILE, cidir, cidirrest, "upgrade", "failed-upgrade"); pkg_set_status(pkg, PKG_STAT_UNPACKED); oldversionstatus = PKG_STAT_UNPACKED; @@ -1409,7 +1408,7 @@ void process_archive(const char *filename) { modstatdb_note(conflictor); push_cleanup(cu_prerminfavour, ~ehflag_normaltidy, 2, conflictor, pkg); - maintscript_installed(conflictor, PRERMFILE, "pre-removal", + maintscript_installed(conflictor, PRERMFILE, "remove", "in-favour", pkgbin_name(pkg, &pkg->available, pnaw_nonambig), versiondescribe(&pkg->available.version, @@ -1429,12 +1428,12 @@ 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, PREINSTFILE, "pre-installation", cidir, cidirrest, + maintscript_new(pkg, PREINSTFILE, cidir, cidirrest, "install", NULL); } else if (oldversionstatus == PKG_STAT_CONFIGFILES) { push_cleanup(cu_preinstnew, ~ehflag_normaltidy, 3,(void*)pkg,(void*)cidir,(void*)cidirrest); - maintscript_new(pkg, PREINSTFILE, "pre-installation", cidir, cidirrest, + maintscript_new(pkg, PREINSTFILE, cidir, cidirrest, "install", versiondescribe(&pkg->installed.version, vdew_nonambig), versiondescribe(&pkg->available.version, vdew_nonambig), @@ -1442,7 +1441,7 @@ void process_archive(const char *filename) { } else { push_cleanup(cu_preinstupgrade, ~ehflag_normaltidy, 4,(void*)pkg,(void*)cidir,(void*)cidirrest,(void*)&oldversionstatus); - maintscript_new(pkg, PREINSTFILE, "pre-installation", cidir, cidirrest, + maintscript_new(pkg, PREINSTFILE, cidir, cidirrest, "upgrade", versiondescribe(&pkg->installed.version, vdew_nonambig), versiondescribe(&pkg->available.version, vdew_nonambig), @@ -1580,7 +1579,7 @@ 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, POSTRMFILE, "post-removal", cidir, cidirrest, + maintscript_fallback(pkg, POSTRMFILE, cidir, cidirrest, "upgrade", "failed-upgrade"); } -- Dpkg.Org's dpkg
