From: David Kalnischkies <david@kalnischkies.de>
Date: Sun, 9 Nov 2014 18:04:54 +0000 (+0100)
Subject: use pkgAcquire::GetLock instead of own code
X-Git-Tag: 1.1.exp9~140^2~95
X-Git-Url: https://git.saurik.com/apt.git/commitdiff_plain/7e04a6bf23d857db60afd2ec3d0f4a8271b1c597?hp=bf6ac7ca615922c23d1f3cf1963efc5be9c23e32

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
---

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());
diff --git a/cmdline/apt-get.cc b/cmdline/apt-get.cc
index a9053bdfd..eab792264 100644
--- a/cmdline/apt-get.cc
+++ b/cmdline/apt-get.cc
@@ -558,30 +558,12 @@ static bool DoClean(CommandLine &)
       return true;
    }
 
-   bool const NoLocking = _config->FindB("Debug::NoLocking",false);
-   // Lock the archive directory
-   FileFd Lock;
-   if (NoLocking == false)
-   {
-      int lock_fd = GetLock(archivedir + "lock");
-      if (lock_fd < 0)
-	 return _error->Error(_("Unable to lock directory %s"), archivedir.c_str());
-      Lock.Fd(lock_fd);
-   }
-
    pkgAcquire Fetcher;
+   Fetcher.GetLock(archivedir);
    Fetcher.Clean(archivedir);
    Fetcher.Clean(archivedir + "partial/");
 
-   if (NoLocking == false)
-   {
-      Lock.Close();
-      int lock_fd = GetLock(listsdir + "lock");
-      if (lock_fd < 0)
-	 return _error->Error(_("Unable to lock directory %s"), listsdir.c_str());
-      Lock.Fd(lock_fd);
-   }
-
+   Fetcher.GetLock(listsdir);
    Fetcher.Clean(listsdir + "partial/");
 
    pkgCacheFile::RemoveCaches();