diff options
| author | David Kalnischkies <david@kalnischkies.de> | 2014-11-09 19:04:54 +0100 |
|---|---|---|
| committer | David Kalnischkies <david@kalnischkies.de> | 2014-11-09 21:45:55 +0100 |
| commit | 7e04a6bf23d857db60afd2ec3d0f4a8271b1c597 (patch) | |
| tree | 81bb72a0619512369349cf82827cfc2ac2c55fe0 /apt-pkg/acquire.cc | |
| parent | bf6ac7ca615922c23d1f3cf1963efc5be9c23e32 (diff) | |
use pkgAcquire::GetLock instead of own code
Do the same with less code in apt-get. This especially ensures that the
lock file (and the parent directories) exist before we are trying to
lock. It also means that clean now creates the directories if they are
missing so we returned to a proper clean state now.
Git-Dch: Ignore
Diffstat (limited to 'apt-pkg/acquire.cc')
| -rw-r--r-- | apt-pkg/acquire.cc | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/apt-pkg/acquire.cc b/apt-pkg/acquire.cc index 2c89c2dea..07c4646f5 100644 --- a/apt-pkg/acquire.cc +++ b/apt-pkg/acquire.cc @@ -152,6 +152,8 @@ bool pkgAcquire::GetLock(std::string const &Lock) return true; // Lock the directory this acquire object will work in + if (LockFD != -1) + close(LockFD); LockFD = ::GetLock(flCombine(Lock, "lock")); if (LockFD == -1) return _error->Error(_("Unable to lock directory %s"), Lock.c_str()); |