diff options
author | David Kalnischkies <kalnischkies@gmail.com> | 2010-08-10 16:04:17 +0200 |
---|---|---|
committer | David Kalnischkies <kalnischkies@gmail.com> | 2010-08-10 16:04:17 +0200 |
commit | b472c6b08e0bfd1ea94390cd525cef579ea3ccee (patch) | |
tree | 721bcf9bbe68590dc6409f4ba2bf85e2fac6a81f /methods/bzip2.cc | |
parent | 47f6d1b72bc883ecdc00542da4c824a5c4fb79fa (diff) | |
parent | 22041bd2864b8d0b401b45dde9eda4003a11fec4 (diff) |
merge with debian-experimental-ma
* Swedish translation update. Closes: #592366
* apt-pkg/pkgcache.cc:
- re-evaluate the architectures cache when the cache is (re)opened
* apt-pkg/cdrom.cc:
- fix off-by-one error in DropBinaryArch
* apt-pkg/contrib/fileutl.cc:
- Add WriteAtomic mode.
- Revert WriteEmpty to old behavior (LP: #613211)
* apt-pkg, methods:
- Convert users of WriteEmpty to WriteAtomic.
* apt-pkg/depcache.cc:
- Only try upgrade for Breaks if there is a newer version, otherwise
handle it as Conflicts (by removing it) (helps for #591882).
* debian/control:
- Add dependency on gnupg to apt, apt-key uses it.
Diffstat (limited to 'methods/bzip2.cc')
-rw-r--r-- | methods/bzip2.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/methods/bzip2.cc b/methods/bzip2.cc index 5da214bfc..19e49828e 100644 --- a/methods/bzip2.cc +++ b/methods/bzip2.cc @@ -91,7 +91,7 @@ bool Bzip2Method::Fetch(FetchItem *Itm) close(GzOut[1]); FileFd FromGz(GzOut[0]); // For autoclose - FileFd To(Itm->DestFile,FileFd::WriteEmpty); + FileFd To(Itm->DestFile,FileFd::WriteAtomic); To.EraseOnFailure(); if (_error->PendingError() == true) return false; |