summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Vogt <michael.vogt@ubuntu.com>2008-10-01 17:55:05 +0200
committerMichael Vogt <michael.vogt@ubuntu.com>2008-10-01 17:55:05 +0200
commitb462d75aab39f85d4ce9bd03c4dfda54f77b566f (patch)
treeff863c08332e4558d02760da48afcad66e02fb20
parentd3eeb2324df154dc2104bbbb98c36d97db69617e (diff)
* apt-pkg/packagemanager.cc, apt-pkg/deb/dpkgpm.cc:
- move the state file writting into the Go() implementation of dpkgpm (closes: #498799)
-rw-r--r--apt-pkg/deb/dpkgpm.cc2
-rw-r--r--apt-pkg/packagemanager.cc4
-rw-r--r--debian/changelog3
3 files changed, 5 insertions, 4 deletions
diff --git a/apt-pkg/deb/dpkgpm.cc b/apt-pkg/deb/dpkgpm.cc
index 2abb3a0ef..c9af2f401 100644
--- a/apt-pkg/deb/dpkgpm.cc
+++ b/apt-pkg/deb/dpkgpm.cc
@@ -927,6 +927,8 @@ bool pkgDPkgPM::Go(int OutStatusFd)
if (RunScripts("DPkg::Post-Invoke") == false)
return false;
+
+ Cache.writeStateFile(NULL);
return true;
}
/*}}}*/
diff --git a/apt-pkg/packagemanager.cc b/apt-pkg/packagemanager.cc
index c391a6036..304d1c653 100644
--- a/apt-pkg/packagemanager.cc
+++ b/apt-pkg/packagemanager.cc
@@ -666,10 +666,6 @@ pkgPackageManager::DoInstallPostFork(int statusFd)
if(goResult == false)
return Failed;
- // if all was fine update the state file
- if(Res == Completed) {
- Cache.writeStateFile(NULL);
- }
return Res;
};
diff --git a/debian/changelog b/debian/changelog
index 9ccb807c3..46d01bdf3 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -45,6 +45,9 @@ apt (0.7.15) UNRELEASED; urgency=low
* apt-pkg/pkgcachegen.cc:
- do not add multiple identical descriptions for the same
language (closes: #400768)
+ * apt-pkg/packagemanager.cc, apt-pkg/deb/dpkgpm.cc:
+ - move the state file writting into the Go() implementation
+ of dpkgpm (closes: #498799)
[ Dereck Wonnacott ]
* apt-ftparchive might write corrupt Release files (LP: #46439)