From 92764088a2b09d4e322d21e769ecb51bb5f3b17c Mon Sep 17 00:00:00 2001
From: Timo Teräs <timo.teras@iki.fi>
Date: Mon, 17 Jun 2013 16:33:59 +0300
Subject: db, cache: do not use cache/tmp for downloads

instead use prefix for temporary files.
---
 src/cache.c | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

(limited to 'src/cache.c')

diff --git a/src/cache.c b/src/cache.c
index d1ce06e..f25f05a 100644
--- a/src/cache.c
+++ b/src/cache.c
@@ -9,6 +9,7 @@
  * by the Free Software Foundation. See http://www.gnu.org/ for details.
  */
 
+#include <fcntl.h>
 #include <errno.h>
 #include <stdio.h>
 #include <dirent.h>
@@ -78,8 +79,10 @@ static void cache_clean_item(struct apk_database *db, int dirfd, const char *nam
 
 	if (apk_verbosity >= 2)
 		apk_message("deleting %s", name);
-	if (!(apk_flags & APK_SIMULATE))
-		unlinkat(dirfd, name, 0);
+	if (!(apk_flags & APK_SIMULATE)) {
+		if (unlinkat(dirfd, name, 0) < 0 && errno == EISDIR)
+			unlinkat(dirfd, name, AT_REMOVEDIR);
+	}
 }
 
 static int cache_clean(struct apk_database *db)
-- 
cgit v1.2.3-60-g2f50