The following commit has been merged in the iwj branch:
commit bbfe5869b7cead49584ab66719be7f97c4aa5565
Author: Ian Jackson <[EMAIL PROTECTED]>
Date: Wed Oct 31 15:35:30 2007 +0000
* Do not pointlessly clear reinstreq flag on postinst abort-remove.
cu_prermremove is only be called via a push_cleanup in remove.c which
is only executed if the package is at least halfconfigured so
reinstreq must be clear to start with.
diff --git a/debian/changelog b/debian/changelog
index a01b67f..54a7869 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -69,6 +69,10 @@ dpkg (1.14.8) UNRELEASED; urgency=low
[ Ian Jackson ]
* Treat successful calls to the postinst as always making the package
installed. Reverts Brian Carlson's patch from #432893.
+ * Do not pointlessly clear reinstreq flag on postinst abort-remove.
+ cu_prermremove is only be called via a push_cleanup in remove.c which
+ is only executed if the package is at least halfconfigured so
+ reinstreq must be clear to start with.
* Mark reinstreq during unpack as late as possible, not before prerm.
Previously the package would be reinstreq while we deal with
conflictors' prerms and deconfiguration, but that's unnecessary.
diff --git a/src/cleanup.c b/src/cleanup.c
index 742daf4..0698af8 100644
--- a/src/cleanup.c
+++ b/src/cleanup.c
@@ -230,7 +230,6 @@ void cu_prermremove(int argc, void **argv) {
if (cleanup_pkg_failed++) return;
maintainer_script_postinst(pkg,
"abort-remove", (char*)0);
- pkg->eflag &= ~eflagf_reinstreq;
cu_postinstdone(pkg);
cleanup_pkg_failed--;
}
--
dpkg's main repository
--
To UNSUBSCRIBE, email to [EMAIL PROTECTED]
with a subject of "unsubscribe". Trouble? Contact [EMAIL PROTECTED]
