The following commit has been merged in the master branch:
commit ee7131abcd7558158d03f5d2761d9e580161e43a
Author: Guillem Jover <guil...@debian.org>
Date: Tue Mar 1 04:43:29 2011 +0100
dpkg: Use package specifiers for maintainer script arguments
Replace pkg->set->name with pkg_name() and pkgbin_name().
Based-on-patch-by: Raphaël Hertzog <hert...@debian.org>
Patch-sponsored-by: Linaro Limited
Signed-off-by: Guillem Jover <guil...@debian.org>
diff --git a/src/cleanup.c b/src/cleanup.c
index 7eff1b1..ab6e7ce 100644
--- a/src/cleanup.c
+++ b/src/cleanup.c
@@ -146,16 +146,21 @@ void cu_prermdeconfigure(int argc, void **argv) {
if (conflictor) {
maintainer_script_postinst(deconf, "abort-deconfigure",
- "in-favour", infavour->set->name,
+ "in-favour",
+ pkgbin_name(infavour, &infavour->available,
+ pnaw_nonambig),
versiondescribe(&infavour->available.version,
vdew_nonambig),
- "removing", conflictor->set->name,
+ "removing",
+ pkg_name(conflictor, pnaw_nonambig),
versiondescribe(&conflictor->installed.version,
vdew_nonambig),
NULL);
} else {
maintainer_script_postinst(deconf, "abort-deconfigure",
- "in-favour", infavour->set->name,
+ "in-favour",
+ pkgbin_name(infavour, &infavour->available,
+ pnaw_nonambig),
versiondescribe(&infavour->available.version,
vdew_nonambig),
NULL);
@@ -170,7 +175,9 @@ void cu_prerminfavour(int argc, void **argv) {
if (cleanup_conflictor_failed++) return;
maintainer_script_postinst(conflictor, "abort-remove",
- "in-favour", infavour->set->name,
+ "in-favour",
+ pkgbin_name(infavour, &infavour->available,
+ pnaw_nonambig),
versiondescribe(&infavour->available.version,
vdew_nonambig),
NULL);
diff --git a/src/processarc.c b/src/processarc.c
index 947bf17..0cc7628 100644
--- a/src/processarc.c
+++ b/src/processarc.c
@@ -341,7 +341,8 @@ pkg_disappear(struct pkginfo *pkg, struct pkginfo *infavour)
maintainer_script_installed(pkg, POSTRMFILE,
"post-removal script (for disappearance)",
"disappear",
- infavour->set->name,
+ pkgbin_name(infavour, &infavour->available,
+ pnaw_nonambig),
versiondescribe(&infavour->available.version,
vdew_nonambig),
NULL);
@@ -710,16 +711,19 @@ void process_archive(const char *filename) {
if (removing) {
maintainer_script_installed(deconpil->pkg, PRERMFILE, "pre-removal",
- "deconfigure", "in-favour", pkg->set->name,
+ "deconfigure", "in-favour",
+ pkgbin_name(pkg, &pkg->available,
pnaw_nonambig),
versiondescribe(&pkg->available.version,
vdew_nonambig),
- "removing", removing->set->name,
+ "removing",
+ pkg_name(removing, pnaw_nonambig),
versiondescribe(&removing->installed.version,
vdew_nonambig),
NULL);
} else {
maintainer_script_installed(deconpil->pkg, PRERMFILE, "pre-removal",
- "deconfigure", "in-favour", pkg->set->name,
+ "deconfigure", "in-favour",
+ pkgbin_name(pkg, &pkg->available,
pnaw_nonambig),
versiondescribe(&pkg->available.version,
vdew_nonambig),
NULL);
@@ -737,7 +741,8 @@ void process_archive(const char *filename) {
push_cleanup(cu_prerminfavour, ~ehflag_normaltidy, NULL, 0,
2,(void*)conflictor[i],(void*)pkg);
maintainer_script_installed(conflictor[i], PRERMFILE, "pre-removal",
- "remove", "in-favour", pkg->set->name,
+ "remove", "in-favour",
+ pkgbin_name(pkg, &pkg->available,
pnaw_nonambig),
versiondescribe(&pkg->available.version,
vdew_nonambig),
NULL);
--
dpkg's main repository
--
To UNSUBSCRIBE, email to debian-dpkg-cvs-requ...@lists.debian.org
with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org
