ensure we got a lock in clean operation

We try to acquired the locks, but we didn't stop if we failed to get it…

Closes: 808561

diff --git a/apt-private/private-download.cc b/apt-private/private-download.cc
index 5cdcf6038441f4513d5202d763aab6942f0a02c7..6f672635fa179f6479045171c0a77fbf1bd437d2 100644 (file)
--- a/apt-private/private-download.cc
+++ b/apt-private/private-download.cc
@@ -309,16 +309,16 @@ bool DoClean(CommandLine &)
    }
 
    pkgAcquire Fetcher;
-   if (archivedir.empty() == false && FileExists(archivedir) == true)
+   if (archivedir.empty() == false && FileExists(archivedir) == true &&
+        Fetcher.GetLock(archivedir) == true)
    {
-      Fetcher.GetLock(archivedir);
       Fetcher.Clean(archivedir);
       Fetcher.Clean(archivedir + "partial/");
    }
 
-   if (listsdir.empty() == false && FileExists(listsdir) == true)
+   if (listsdir.empty() == false && FileExists(listsdir) == true &&
+        Fetcher.GetLock(listsdir) == true)
    {
-      Fetcher.GetLock(listsdir);
       Fetcher.Clean(listsdir + "partial/");
    }
 

diff --git a/test/integration/test-apt-get-clean b/test/integration/test-apt-get-clean
index 9d15cd8267c21c01a7e04480ef9363b64b86be28..6bf20c8d7bafcb7ded0b0572f7acc4a59c4bd667 100755 (executable)
--- a/test/integration/test-apt-get-clean
+++ b/test/integration/test-apt-get-clean
@@ -36,6 +36,16 @@ testfailure test -e rootdir/var/cache/apt/archives/foo_2_all.deb
 testfailure test -e rootdir/var/cache/apt/archives/foo_3_all.deb
 testfailure test -e rootdir/var/cache/apt/archives/foo_4_all.deb
 
+if [ "$(id -u)" != '0' ]; then
+       msgmsg 'No clean if lock can not be acquired'
+       touch rootdir/var/cache/apt/archives/foo_4_all.deb
+       touch rootdir/var/cache/apt/archives/lock
+       chmod 444 rootdir/var/cache/apt/archives/lock
+       testfailure apt clean
+       testsuccess test -e rootdir/var/cache/apt/archives/foo_4_all.deb
+       chmod 644 rootdir/var/cache/apt/archives/lock
+fi
+
 directorygone() {
        rm -rf "$1"
        testsuccess apt autoclean