diff options
| author | David Kalnischkies <david@kalnischkies.de> | 2016-06-29 14:46:34 +0200 |
|---|---|---|
| committer | Julian Andres Klode <jak@debian.org> | 2016-08-31 13:15:15 +0200 |
| commit | dd45e6db683f50b9d8b1b18c2cfe50a4f9a38feb (patch) | |
| tree | 7b60d5c9e69843fc273cf33f2871155e1d477580 /apt-pkg/contrib/fileutl.cc | |
| parent | b7d7ecc78946146d359534d8a2aa0f55bad40ab4 (diff) | |
don't do atomic overrides with failed files
We deploy atomic renames for some files, but these renames also happen
if something about the file failed which isn't really the point of the
exercise…
Closes: 828908
(cherry picked from commit fc5db01bb7d1546944200d197866b0b5c378f100)
Diffstat (limited to 'apt-pkg/contrib/fileutl.cc')
| -rw-r--r-- | apt-pkg/contrib/fileutl.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/apt-pkg/contrib/fileutl.cc b/apt-pkg/contrib/fileutl.cc index 68298d785..09dce4123 100644 --- a/apt-pkg/contrib/fileutl.cc +++ b/apt-pkg/contrib/fileutl.cc @@ -2619,7 +2619,7 @@ bool FileFd::Close() } if ((Flags & Replace) == Replace) { - if (rename(TemporaryFileName.c_str(), FileName.c_str()) != 0) + if (Failed() == false && rename(TemporaryFileName.c_str(), FileName.c_str()) != 0) Res &= _error->Errno("rename",_("Problem renaming the file %s to %s"), TemporaryFileName.c_str(), FileName.c_str()); FileName = TemporaryFileName; // for the unlink() below. |