diff options
| author | David Kalnischkies <kalnischkies@gmail.com> | 2011-04-20 16:02:44 +0200 |
|---|---|---|
| committer | David Kalnischkies <kalnischkies@gmail.com> | 2011-04-20 16:02:44 +0200 |
| commit | d8cba717e011eeae1be346325fd476f4caa753f3 (patch) | |
| tree | 7c05684916eb6404872e5cd5b2ca6376d4cc0af7 | |
| parent | e9d27d26fe305ad3a892e401c4b1134ecc2fc4af (diff) | |
| parent | ab60fb67a9917bfb8cb96576d6452f1ec9d34e0d (diff) | |
merge with debian-sid branch and 0.8.14.1 release
* apt-pkg/depcache.cc:
- Really release action groups only once (Closes: #622744)
* apt-pkg/acquire-item.cc:
- Only try to rename existing Release files (Closes: #622912)
| -rw-r--r-- | apt-pkg/acquire-item.cc | 2 | ||||
| -rw-r--r-- | apt-pkg/depcache.cc | 2 | ||||
| -rw-r--r-- | debian/changelog | 13 |
3 files changed, 14 insertions, 3 deletions
diff --git a/apt-pkg/acquire-item.cc b/apt-pkg/acquire-item.cc index 1d651ba69..7b120d3ce 100644 --- a/apt-pkg/acquire-item.cc +++ b/apt-pkg/acquire-item.cc @@ -1504,7 +1504,7 @@ void pkgAcqMetaIndex::Failed(string Message,pkgAcquire::MethodConfig *Cnf) /* Always move the meta index, even if gpgv failed. This ensures * that PackageFile objects are correctly filled in */ - { + if (FileExists(DestFile)) { string FinalFile = _config->FindDir("Dir::State::lists"); FinalFile += URItoFileName(RealURI); /* InRelease files become Release files, otherwise diff --git a/apt-pkg/depcache.cc b/apt-pkg/depcache.cc index dc4a65bc1..474313a0d 100644 --- a/apt-pkg/depcache.cc +++ b/apt-pkg/depcache.cc @@ -70,7 +70,7 @@ void pkgDepCache::ActionGroup::release() cache.MarkAndSweep(); } - released = false; + released = true; } } diff --git a/debian/changelog b/debian/changelog index 9eae2d94e..762688386 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,8 @@ -apt (0.8.14.1) unstable; urgency=low +apt (0.8.14.2) UNRELEASED; urgency=low + + [ Julian Andres Klode ] + * apt-pkg/depcache.cc: + - Really release action groups only once (Closes: #622744) [ David Kalnischkies ] * fix a bunch of cppcheck warnings/errors based on a patch by @@ -22,6 +26,13 @@ apt (0.8.14.1) unstable; urgency=low -- David Kalnischkies <kalnischkies@gmail.com> Tue, 19 Apr 2011 20:57:52 +0200 +apt (0.8.14.1) unstable; urgency=low + + * apt-pkg/acquire-item.cc: + - Only try to rename existing Release files (Closes: #622912) + + -- Julian Andres Klode <jak@debian.org> Sat, 16 Apr 2011 14:36:10 +0200 + apt (0.8.14) unstable; urgency=low [ Julian Andres Klode ] |