From 19883e510af7ea682875d697cb88ad8a21a08d89 Mon Sep 17 00:00:00 2001 From: David Kalnischkies Date: Wed, 29 Jun 2016 14:57:00 +0200 Subject: if reading of autobit state failed, let write fail If we can't read the old file we can't just move forward as that would discard potentially discard old data (especially other fields). We let it fail only after we are done writing the new file so a user has the chance to look into and merge the new data (which is otherwise discarded). (cherry picked from commit 520931867ee2fac8415a624204414d3b62550996) --- apt-pkg/depcache.cc | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/apt-pkg/depcache.cc b/apt-pkg/depcache.cc index aa434e99c..5af94a58b 100644 --- a/apt-pkg/depcache.cc +++ b/apt-pkg/depcache.cc @@ -326,6 +326,11 @@ bool pkgDepCache::writeStateFile(OpProgress * const /*prog*/, bool const Install return false; } } + if (StateFile.Failed()) + { + OutFile.OpFail(); + return false; + } if (OutFile.Close() == false) return false; chmod(state.c_str(), 0644); -- cgit v1.2.3