summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Vogt <michael.vogt@ubuntu.com>2009-02-09 14:38:11 +0100
committerMichael Vogt <michael.vogt@ubuntu.com>2009-02-09 14:38:11 +0100
commit7e522e9e0e4808202061e0a73345bd8b18eccde3 (patch)
tree40eddc2b3dde5e238aae20989e1710c6ce29adcf
parent8872c430df84660fa994db0ebfa67861239fe739 (diff)
* apt-pkg/pkgcache.cc:
- do not run "dpkg --configure pkg" if pkg is in trigger-awaited state (LP: #322955) - do not unlink files in partial/ (thanks to robbiew)
-rw-r--r--apt-pkg/pkgcache.cc8
-rw-r--r--debian/changelog4
-rw-r--r--methods/https.cc1
3 files changed, 10 insertions, 3 deletions
diff --git a/apt-pkg/pkgcache.cc b/apt-pkg/pkgcache.cc
index 8eb62089a..4fbf42c4b 100644
--- a/apt-pkg/pkgcache.cc
+++ b/apt-pkg/pkgcache.cc
@@ -275,8 +275,12 @@ pkgCache::PkgIterator::OkState pkgCache::PkgIterator::State() const
if (Pkg->CurrentState == pkgCache::State::UnPacked ||
Pkg->CurrentState == pkgCache::State::HalfConfigured ||
- Pkg->CurrentState == pkgCache::State::TriggersPending ||
- Pkg->CurrentState == pkgCache::State::TriggersAwaited)
+ //we don't need to care for triggers awaiting packages
+ //dpkg will deal with them automatically when the
+ //trigger pending action is run (those packages are usually
+ //in half-configured or triggers-pending state)
+ //Pkg->CurrentState == pkgCache::State::TriggersAwaited
+ Pkg->CurrentState == pkgCache::State::TriggersPending)
return NeedsConfigure;
if (Pkg->CurrentState == pkgCache::State::HalfInstalled ||
diff --git a/debian/changelog b/debian/changelog
index 23a0514f6..0e2d3afe6 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -32,8 +32,12 @@ apt (0.7.20.2ubuntu1) jaunty; urgency=low
* cmdline/apt-get.cc:
- default to "false" for the "APT::Get::Build-Dep-Automatic"
option (follow debian here)
+ * apt-pkg/pkgcache.cc:
+ - do not run "dpkg --configure pkg" if pkg is in trigger-awaited
+ state (LP: #322955)
* methods/https.cc:
- add Acquire::https::AllowRedirect support
+ - do not unlink files in partial/ (thanks to robbiew)
[ Dereck Wonnacott ]
* Clarify the --help for 'purge' (LP: #243948)
diff --git a/methods/https.cc b/methods/https.cc
index 87de54589..8bf44b52a 100644
--- a/methods/https.cc
+++ b/methods/https.cc
@@ -253,7 +253,6 @@ bool HttpsMethod::Fetch(FetchItem *Itm)
// cleanup
if(success != 0)
{
- unlink(File->Name().c_str());
_error->Error("%s", curl_errorstr);
Fail();
return true;