The following commit has been merged in the iwj branch:
commit 9bf0732f31b0675029d4d7fb7f3d8aa8c3d5646f
Author: Ian Jackson <[EMAIL PROTECTED]>
Date: Wed Oct 31 15:26:00 2007 +0000
* 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/debian/changelog b/debian/changelog
index db30d70..a01b67f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -69,6 +69,9 @@ 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.
+ * 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.
-- Raphael Hertzog <[EMAIL PROTECTED]> Mon, 08 Oct 2007 20:49:51 +0200
diff --git a/src/cleanup.c b/src/cleanup.c
index 91c11e5..742daf4 100644
--- a/src/cleanup.c
+++ b/src/cleanup.c
@@ -119,7 +119,6 @@ void cu_prermupgrade(int argc, void **argv) {
versiondescribe(&pkg->available.version,
vdew_nonambig),
(char*)0);
- pkg->eflag &= ~eflagf_reinstreq;
cu_postinstdone(pkg);
cleanup_pkg_failed--;
}
diff --git a/src/processarc.c b/src/processarc.c
index 6e14c33..878e629 100644
--- a/src/processarc.c
+++ b/src/processarc.c
@@ -397,7 +397,6 @@ void process_archive(const char *filename) {
oldversionstatus == stat_triggersawaited ||
oldversionstatus == stat_triggerspending ||
oldversionstatus == stat_installed) {
- pkg->eflag |= eflagf_reinstreq;
pkg->status= stat_halfconfigured;
modstatdb_note(pkg);
push_cleanup(cu_prermupgrade,~ehflag_normaltidy, 0,0, 1,(void*)pkg);
--
dpkg's main repository
--
To UNSUBSCRIBE, email to [EMAIL PROTECTED]
with a subject of "unsubscribe". Trouble? Contact [EMAIL PROTECTED]
